Commit Graph

273 Commits

Author SHA1 Message Date
James
e1ec4b66fd Some modularisation 2022-02-27 16:02:26 +00:00
Crowbar764
48671434ce Merge branch 'master' into player-panel-tgui 2022-02-26 10:36:06 +00:00
James
7932cd7b07 Cleanup 3 2022-02-26 09:59:54 +00:00
James
a5d37e701f More cleanup 2022-02-26 09:07:58 +00:00
James
d55f509282 Cleanup 2022-02-26 06:42:19 +00:00
BongaTheProto
cf8bd00d1b Merge branch 'master' into pr/203 2022-02-25 15:56:40 -05:00
BongaTheProto
83e6152438 Merge pull request #209 from SPLURT-Station/swaos
I figured out why city boys don't drive lifted trucks very much
2022-02-25 14:30:57 -06:00
James
31b5fade19 Added more stuff to PP and misc 2022-02-25 05:12:50 +00:00
BongaTheProto
ea8654286c s
s
2022-02-23 23:13:14 -05:00
The-Sun-In-Splendour
abb2c90a76 AAAAAAAAAAAAAAAAA 2022-02-23 16:26:16 +01:00
Ludox
54bd7a1d8f EVEN LESS LETHAL I STILL LOVE LEAN THO 2022-02-23 16:24:17 +01:00
Ludox
0f584ad766 LEAN IS LESS LETHAL NOW 2022-02-23 16:22:46 +01:00
Ludox
0d469beeb0 I FUCKING LOVE LEAN AAAAAAAAAAAAA 2022-02-23 13:02:00 +01:00
James
6717ae7dd2 Jobban panel merged with player panel 2022-02-21 19:21:13 +00:00
BongaTheProto
26a12201ed Merge pull request #206 from radar651/Enforcerework
Moving of the Captain's Enforcer
2022-02-20 22:55:05 -06:00
BongaTheProto
169848f015 Yeah this is gonna be necessary 2022-02-20 23:40:12 -05:00
James
77d2faa8da About to merge player / jobban panel 2022-02-21 02:43:14 +00:00
BongaTheProto
94a83b39f6 Update splurt_emotes.dm 2022-02-20 16:39:24 -05:00
BongaTheProto
ee9e61f38c sus
sus
2022-02-20 15:58:27 -05:00
radar651
9c211fe40b I am mad I have to even do this
Like really mad.
2022-02-20 14:01:07 -06:00
James
ef610eb21c WIP jobban panel 2022-02-20 18:40:00 +00:00
radar651
3180abb8cf Update vest.dm 2022-02-20 12:08:35 -06:00
radar651
24ae6d0673 Spelling mistakes from a privous update
Fixed some spelling mistakes
2022-02-20 12:06:56 -06:00
radar651
fcf530e70e Runtime
Damn errors.. get that cat out of my code!
2022-02-20 03:36:03 -06:00
BongaTheProto
1535b02326 boowomp
Boowomp
2022-02-20 04:27:36 -05:00
radar651
cef9a9a151 Minor fixes
I made bugs
2022-02-20 03:12:59 -06:00
radar651
7f1b45bf49 CBRN gear
First push of the CBRN gear
2022-02-20 02:47:37 -06:00
James
1038df6983 First page of panel basically done 2022-02-19 17:42:17 +00:00
BongaTheProto
0f94bdca52 Merge pull request #201 from PurpleFenn/fenn/maps
Maps 2 Electric Boogaloo
2022-02-18 14:53:36 -05:00
BongaTheProto
c8060ac1a2 Merge pull request #193 from Crowbar764/slaver-patch-4
Slaver Patch 4
2022-02-18 01:41:10 -05:00
PurpleFenn
29315496d8 Added config option for no repeats 2022-02-17 23:19:32 -05:00
BongaTheProto
9dc3ba4c86 aaaaa
aaaaaaaaaa
2022-02-17 05:22:49 -05:00
BongaTheProto
7105909dcd enough clussy fo tonight
hope you mfrs are happy
2022-02-17 05:07:47 -05:00
BongaTheProto
88b01b1eec Merge branch 'master' into HONK-HONK-N!664 2022-02-17 03:44:20 -05:00
BongaTheProto
b9773b3250 Update rbmk.dm
no docs?
2022-02-17 03:41:32 -05:00
BongaTheProto
4024b20c39 Merge pull request #191 from SPLURT-Station/this-will-soon-be-a-cum-nuke
Ports RBMK
2022-02-17 03:32:54 -05:00
BongaTheProto
5c5955bd83 Merge branch 'master' into HONK-HONK-N!664 2022-02-16 16:12:25 -05:00
James
5794ec8803 Fixes ransom table to be sorted numerically 2022-02-16 18:07:24 +00:00
jbox1
a6f17ec80b lewdout items 2022-02-16 14:17:52 +11:00
BongaTheProto
7576d7ad8e what this branch is actually for
heheheha
2022-02-15 19:15:09 -05:00
James
1facd5681f Removes slaver engi-model, it was not worth it 2022-02-15 20:51:10 +00:00
James
03e70ef8b8 Fixes recruitment popup accepting when player actually disconnected 2022-02-15 20:40:54 +00:00
James
cceee632f8 Adds slaver teleport tool to borg loadout 2022-02-15 19:28:53 +00:00
James
178b0ebef4 Adds option to recruit slaves 2022-02-15 13:27:59 +00:00
James
6e7f5c723d Adds Slaver borgs 2022-02-15 03:27:43 +00:00
James
ac9d0b8354 Nerfs teleport implant, adds 5 second channel 2022-02-15 03:23:15 +00:00
James
8cac3dc8f7 Fixes broken export 2022-02-15 02:34:57 +00:00
James
aad0fca07f Automatic slave pricing and other stuff 2022-02-15 00:53:58 +00:00
radar651
ad6b349f5d FIXING SYNTAX ERRORS
Damnit Randy you greasy fucker!
2022-02-14 13:25:44 -06:00
radar651
4b7cc25b7d Some minor patches
God I love patches, patches, patches, patches.
2022-02-14 13:21:04 -06:00