Commit Graph

3533 Commits

Author SHA1 Message Date
hydrant
899fbd2fde typo 2021-05-27 22:09:20 +02:00
hydrant
5fb233cef5 frisk typo, hanf nur für gangs, 10 cannabis für 1 joint, no riot frisk 2021-05-27 22:07:10 +02:00
hydrant
60fedce0bc fix rubellos 2021-05-27 21:47:17 +02:00
hydrant
1dea6bc28d diverse fixes und improvments 2021-05-27 21:41:24 +02:00
hydrant
5884ee50d9 Merge branch 'feature/hanf' into 'develop'
HANF

See merge request log-gtav/reallife-gamemode!76
2021-05-27 19:13:07 +00:00
hydrant
48b4cc22a7 fix merge 2021-05-27 21:12:44 +02:00
hydrant
60f55e0eeb hanf vielleicht fertig 2021-05-27 21:11:11 +02:00
hydrant
211269d03a wt bruch micha bekommt keine gitlab rechte mehr 2021-05-27 21:10:50 +02:00
hydrant
4be3137cc5 hanf wachstum 2021-05-27 21:10:50 +02:00
hydrant
3abf2a2d0e hanf continuation 2021-05-27 21:10:49 +02:00
hydrant
a49fcf09c7 samen kaufen und hanf -> joint 2021-05-27 21:10:47 +02:00
hydrant
d72f7216cc fix pedmanager 2021-05-27 21:10:22 +02:00
hydrant
848353053b addserver function to set inventory show 2021-05-27 21:10:21 +02:00
hydrant
34033eb875 Add Hanf items, some inventory mess removed 2021-05-27 21:10:18 +02:00
hydrant
467e0a4248 Add legal option to items 2021-05-27 21:09:15 +02:00
Luke
6782751d09 eventport nachrichten angepasst 2021-05-26 17:54:45 +00:00
Luke
7bd406cfa7 numberplates aktualisiert 2021-05-25 22:24:25 +00:00
michael.reiswich
f375e699c0 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-05-26 00:16:53 +02:00
michael.reiswich
d9ecae1d1d changes on Notfallkit & Rubbellos 2021-05-26 00:16:38 +02:00
hydrant
e11ae81f02 Merge branch 'cherry-pick-294b0f5a' into 'master'
spawnschutz raus hotfix

See merge request log-gtav/reallife-gamemode!75
2021-05-25 22:04:45 +00:00
michael.reiswich
c00a45a49f fix spawnschutz raus
(cherry picked from commit da83d48256)
2021-05-25 22:04:25 +00:00
michael.reiswich
5920c47865 spawnschutz raus & SF, LV rein zum gucken
(cherry picked from commit 294b0f5aa8)
2021-05-25 22:03:50 +00:00
hydrant
bf2ea8def5 Merge branch 'cherry-pick-cb78c351' into 'master'
jeder kann in den chat schreiben

See merge request log-gtav/reallife-gamemode!74
2021-05-25 20:23:19 +00:00
Luke
9774074901 jeder kann in den chat schreiben
(cherry picked from commit cb78c351e6)
2021-05-25 20:22:11 +00:00
Luke
cb78c351e6 jeder kann in den chat schreiben 2021-05-25 20:21:19 +00:00
hydrant
67ff21d212 Merge branch 'hotfix/mehr-logs' into 'master'
lückenlose nachvollziehbarkeit

See merge request log-gtav/reallife-gamemode!73
2021-05-25 19:37:36 +00:00
hydrant
740bf7f09f merge 2021-05-25 21:35:46 +02:00
michael.reiswich
2aadef55dd danke kopf entwicklung hydrant 2021-05-25 21:28:10 +02:00
michael.reiswich
1152c4b11b changes 2021-05-25 21:26:47 +02:00
michael.reiswich
5044c8e295 changes something 2021-05-25 21:04:35 +02:00
hydrant
16aab6a8bb lückenlose nachvollziehbarkeit 2021-05-25 20:45:31 +02:00
michael.reiswich
7159485742 raus 2021-05-25 17:26:41 +02:00
michael.reiswich
5df58c9532 test 2021-05-25 17:22:36 +02:00
michael.reiswich
79aa46b48f will unterscheid sehen 2021-05-25 17:07:45 +02:00
michael.reiswich
d58a19033d add selbsteinknasten 2021-05-25 15:28:41 +02:00
michael.reiswich
9fe9cb1466 weitere ipls rein 2021-05-24 23:35:20 +02:00
michael.reiswich
679ae7edd5 ipl-load at connect 2021-05-24 21:55:58 +02:00
michael.reiswich
da83d48256 fix spawnschutz raus 2021-05-24 13:29:11 +02:00
michael.reiswich
1621576758 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-05-24 13:08:33 +02:00
michael.reiswich
294b0f5aa8 spawnschutz raus & SF, LV rein zum gucken 2021-05-24 13:08:14 +02:00
hydrant
d295726df6 fix mfr 2021-05-24 12:41:29 +02:00
hydrant
6e0f6a00ef fix managefactionranks 2021-05-24 12:36:56 +02:00
Luke
e4247faa2c repairkit notifications textlich angepasst 2021-05-23 23:08:55 +00:00
michael.reiswich
0e34b9f88a Notfallkit nicht beim Waffentransporter möglich 2021-05-23 15:00:34 +02:00
michael.reiswich
ad168aed7f more money for fib & pd 2021-05-23 14:48:25 +02:00
hydrant
8c964dc026 Merge branch 'hotfix/luke' into 'master'
hab die kirschen gepflückt

See merge request log-gtav/reallife-gamemode!72
2021-05-22 11:20:39 +00:00
michael.reiswich
0d19373064 add notification *Du besitzt keinen Flug/Führerschein* 2021-05-22 00:45:42 +02:00
michael.reiswich
591d592a3a kofferraum öffnen range erhöht 2021-05-22 00:16:57 +02:00
michael.reiswich
502b43f933 fix job annehmen /Du benötigst einen Führerschein für Pilot 2021-05-21 22:42:40 +02:00
michael.reiswich
82c7a0cb8e add GEZ 2021-05-21 21:33:53 +02:00