Commit Graph

1420 Commits

Author SHA1 Message Date
radar651
39a7754fe7 Merge branch 'SPLURT-Station:master' into jobsandholsters2 2022-02-13 12:49:14 -06:00
BongaTheProto
6b429a0843 I'm waking up
to ash and dust
I wipe my ass and I slap my nuts
2022-02-13 13:02:42 -05:00
BongaTheProto
6ae92b05ac Merge branch 'master' into more-yoinks 2022-02-12 02:28:31 -05:00
BongaTheProto
ef5ff42af9 Merge pull request #188 from Crowbar764/adds-clothes
Detective Trenchcoat - Lanyard variation
2022-02-12 02:16:44 -05:00
BongaTheProto
60c8b9ce9b Carrion and dancer
why are these even a thing
2022-02-12 02:11:35 -05:00
BongaTheProto
4527c0e529 this "works"... somehow...
I can already smell the runtimes and bugs...
2022-02-12 00:19:03 -05:00
James
e357479267 Modularises 2022-02-11 17:45:48 +00:00
Uso15
9791c50c60 Icon change 2022-02-11 00:33:47 -06:00
radar651
a8b9877333 Oops
Once again, I am an idiot
2022-02-10 21:16:17 -06:00
radar651
4413af0bdb Update pistol.dm 2022-02-10 21:12:11 -06:00
radar651
3c62c84301 More fixes
Fucking attempts to fix problems caused by the Brig timers bugging the fuck out.
2022-02-10 11:29:03 -06:00
radar651
9f8ee3b60a Fixed?
I pray
2022-02-10 02:40:25 -06:00
radar651
a232b2e147 This broke the update
Reverting this
2022-02-10 00:40:00 -06:00
radar651
13e43077c8 MORE BUG FIXES
I think I fixed everything were broken
2022-02-09 21:33:36 -06:00
radar651
b015585950 Some more minor fixes
I missed some bugs.
2022-02-09 19:53:42 -06:00
radar651
ad269f35e4 Minor bug fix
I made some stupids
2022-02-09 19:20:25 -06:00
radar651
be5f19349a I hate spelling mistakes
I really do.
2022-02-09 16:09:31 -06:00
radar651
a5056bfb7d Fixes the area errors
I am stupid
2022-02-09 16:05:26 -06:00
radar651
df30a0ba35 Update blueshield.dm 2022-02-09 15:45:08 -06:00
radar651
40070fd2af Slight fix
Oops
2022-02-09 15:36:28 -06:00
radar651
4350a1fd6d Jobs and Holster Update 2
A massive job update, some buffing, some nerfing, some new things
2022-02-09 15:34:58 -06:00
PurpleFenn
3b0ab9703d fuck 2022-02-08 18:30:49 -05:00
PurpleFenn
0ba7cbcc10 Update Copium 2022-02-08 17:50:46 -05:00
PurpleFenn
ccb0e4ccea Cope and seethe 2022-02-08 08:32:53 -05:00
PurpleFenn
a44973ea6a Add RTC
This was originally meant to be a joke but I kinda liked the idea so
fuck it. Enjoy, nerds.
2022-02-06 22:43:41 -05:00
BongaTheProto
8fc74e2477 Merge pull request #169 from Crowbar764/runtime-hunting
Patches some of the most common runtimes
2022-02-06 19:55:41 -05:00
BongaTheProto
6886d60cde Merge pull request #175 from Uso15/Hypno-patch
Hypno patch
2022-02-06 19:55:30 -05:00
Uso15
5394e00d5e Hypno patch
Added additional checks for Hypno prefs for Hypnotic gaze and mesmetron
2022-02-06 00:47:38 -06:00
BongaTheProto
9e61d16c1a Merge pull request #164 from radar651/jobsandholsters
Jobs and Holstesr Part 1 (Mostly Modular)
2022-02-05 19:09:14 -05:00
BongaTheProto
05f1b036ab Merge pull request #173 from NopemanMcHalt/bababooey
bababooey
2022-02-05 19:08:56 -05:00
BongaTheProto
bd1ea4cbcc Update accountlink.dm 2022-02-05 18:55:36 -05:00
radar651
c805c1d851 Final update (?)
This should be a final update, no more patches should be needed, hopfully.
2022-02-05 15:11:43 -06:00
Anonymous
3b29b844b9 bababooey 2022-02-05 19:22:53 +03:00
radar651
37c3defca7 Fixed the filename
I am an idiot
2022-02-05 10:14:09 -06:00
radar651
59f72cdf77 ACTUALLY FIXING DIGI
Actually fixes the Digi sprites!
2022-02-05 09:28:39 -06:00
James
cc18d1efcd Fixes mesmotron.dm runtime (I hope) 2022-02-05 12:15:00 +00:00
personlized
5f84725ece Update backpack.dm 2022-02-04 23:12:14 -08:00
BongaTheProto
f4e63efc67 Merge pull request #168 from Uso15/Hypnotic-gaze
Hypnotic gaze
2022-02-04 21:46:28 -05:00
BongaTheProto
ef33b1f3ef actually let's just 2022-02-04 20:38:58 -05:00
jbox1
570c92d539 bruh 2022-02-05 10:28:40 +11:00
radar651
994e6142e5 Addes a spawn message
Addes a spawn message for the Blueshield
2022-02-04 13:36:00 -06:00
Crowbar764
71d8933198 Merge branch 'master' into slave-antag-patch 2022-02-04 05:51:35 +00:00
BongaTheProto
b47a058bf6 adios popo
we aint needing these anymore
2022-02-04 00:17:47 -05:00
Uso15
bf622ed570 Merge branch 'SPLURT-Station:master' into Hypnotic-gaze 2022-02-03 20:56:03 -06:00
Uso15
dc19d3873b Wording fix 2022-02-03 20:55:29 -06:00
Uso15
275c2909ee spelling error 2022-02-03 20:00:47 -06:00
radar651
eb18dc84f2 Access and deparment head change
Addes the Heads of staff to access and changes the deparment head to central command.
2022-02-03 17:08:16 -06:00
Uso15
2bda3b9db6 Co-authored-by: Aypa <WoolyAypa@users.noreply.github.com> 2022-02-03 15:05:50 -06:00
Uso15
f55b404a93 Update neutral.dm 2022-02-03 13:15:04 -06:00
James
d51a937736 Not sure why Abductor gear needed an ID, seems to work without one. 2022-02-03 15:33:40 +00:00