cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-21 07:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

1420 Commits

Author SHA1 Message Date
BongaTheProto
09f4315cbd Merge branch 'master' of https://github.com/AshTheDerg/S.P.L.U.R.T-Station-13 into pr/340 2022-06-20 01:27:31 -05:00
BongaTheProto
385b4efc5d Merge branch 'master' into pr/340 2022-06-20 01:25:23 -05:00
AshTheDerg
6b1a172c34 Peacekeeper Rebalance 
Swapped PKs down to standard tasers, took away their security locker access, swapped them to Civ Pay
 2022-06-19 01:23:36 -04:00
WoolyAypa
4c0974d472 now it's properly negative 2022-06-18 17:30:13 -03:00
WoolyAypa
06e83eafc7 cummy points 2022-06-18 17:26:52 -03:00
BongaTheProto
b1794b83ca another one 2022-06-17 18:38:55 -05:00
BongaTheProto
56a5e5bf67 last minute ideas 
fuccccccccc
 2022-06-17 12:49:45 -05:00
WoolyAypa
438bc50757 what even is a trailing newline? 2022-06-17 14:14:15 -03:00
WoolyAypa
9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
BongaTheProto
921f93fe50 all the other barks 
(that I have been requested)
 2022-06-17 11:30:57 -05:00
BongaTheProto
16ea17e55b nut dealer 
sans?? sans! wake up!
 2022-06-17 02:36:51 -05:00
WoolyAypa
af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
BongaTheProto
18d3a50af9 allows fun :3 
these sound good idfc what you say
 2022-06-16 23:58:05 -05:00
BongaTheProto
ea72d7602c Update zombies2.dm 
bunch of runtimes
 2022-06-16 16:46:18 -05:00
BongaTheProto
375c0f2634 Merge branch 'master' into pr/359 2022-06-16 16:43:41 -05:00
BongaTheProto
0fa825daec better mob handling 2022-06-16 03:07:08 -05:00
BongaTheProto
ba6bb76258 maybe less lag? 
limits the amount of infinidorms for good
 2022-06-16 02:39:56 -05:00
BongaTheProto
3cf75c8442 smol thing 2022-06-15 22:29:47 -05:00
BongaTheProto
b95b11ed50 Merge pull request #364 from AshTheDerg/patch-3 
Syndie Space Rock Ghost Role and Radio Station
 2022-06-15 12:17:47 -07:00
Pin-alternative
407989f08b Merge remote-tracking branch 'upstream/master' into cursed 2022-06-14 19:43:07 +10:00
AshTheDerg
237e899349 Blueshield Holo Badge 
Suggestion #2015
 2022-06-14 04:57:10 -04:00
AshTheDerg
529ca9f958 Peacekeeper Redux 
People got pissed about them having a T-Baton and the Hypo. I'm leaving the Hypo in and taking away their baton. They get a Taser now. Cope.
 2022-06-12 19:43:58 -04:00
BongaTheProto
5b996fa2ca Merge pull request #368 from NopemanMcHalt/goners_holster 
Allows trencher's coat to hold some extra items (Suggestion 1913)
 2022-06-12 13:26:28 -07:00
BongaTheProto
d4a1b4e594 Merge pull request #373 from SPLURT-Station/fix-donut 
Size normalizers update
 2022-06-12 13:00:55 -07:00
BongaTheProto
ab01647108 Merge pull request #375 from AshTheDerg/patch-4 
Sylveon Accessory Bounty
 2022-06-12 12:54:53 -07:00
AshTheDerg
805441b3b0 Sylveon Bounty Modularize 2022-06-12 15:24:43 -04:00
AshTheDerg
64e9e57489 Sylveon Bounty Modularize 2022-06-12 15:24:10 -04:00
BongaTheProto
18363fa75f Merge branch 'master' into fix-donut 2022-06-12 01:16:56 -05:00
BongaTheProto
e566d94019 better safe than sorry 2022-06-11 23:34:14 -05:00
AshTheDerg
828231c2be Rifle Sling Biogenerator fix 
Accidentally overwrote Shoulder Holster design. This'll fix it.
 2022-06-11 10:47:41 -04:00
AshTheDerg
fcce515319 Peacekeeper Redo 2022-06-11 01:08:48 -04:00
AshTheDerg
da826f9c72 Deputy Badges 2022-06-11 01:02:52 -04:00
AshTheDerg
1394832ce8 Peacekeeper Redo 2022-06-11 00:27:53 -04:00
AshTheDerg
23324aa837 Deputy Badges 2022-06-11 00:06:10 -04:00
AshTheDerg
4641d8fa6b Peacekeeper Redo 2022-06-10 23:58:23 -04:00
AshTheDerg
40a0a78d31 Peacekeeper Redo 2022-06-10 23:57:22 -04:00
AshTheDerg
1d8a5d4ba1 Security Pouch redo 2022-06-10 23:53:59 -04:00
AshTheDerg
9bfa72b43a Deputy Badges 2022-06-10 23:41:18 -04:00
BongaTheProto
da9ca3a4cc Update kinkmate.dm 2022-06-10 17:54:43 -05:00
BongaTheProto
8d37fd1953 Merge branch 'master' into fix-donut 2022-06-10 17:46:16 -05:00
BongaTheProto
5f72372c88 Merge pull request #371 from AshTheDerg/master 
Holo Badges, Omnitools, and more!
 2022-06-10 15:11:52 -07:00
BongaTheProto
36e9a914af makes them actual rings 
i was wondering why it didn't worl
 2022-06-10 16:31:39 -05:00
AshTheDerg
27e736a917 Hopefully fixes 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-06-10 01:30:01 -04:00
AshTheDerg
064e13020f Hopefully fixes 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-06-10 01:29:48 -04:00
BongaTheProto
92afd51b8a Merge branch 'master' into fix-donut 2022-06-10 00:21:08 -05:00
BongaTheProto
d51f5b1bb6 normalizers but better 
snowflake status = destroyed,,,
 2022-06-10 00:19:34 -05:00
Pin-alternative
79ab402216 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-10 07:45:46 +10:00
Bangus
74d0fc1d93 healthscanner refuckery zombie edition 2022-06-09 12:32:25 -04:00
AshTheDerg
8037d81ad1 Update backpack.dm 2022-06-09 08:20:13 -04:00
AshTheDerg
7c9d7f9ed7 Security Badge tweak 
Makes Security Badges a (free) loadout option instead of given by default, so officers can choose between holo or regular.
 2022-06-09 08:09:58 -04:00