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-15 20:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,403 Commits 55 Branches 0 Tags
30471d41711d31e6671e765892a6dbd218f19d09
Commit Graph

24604 Commits

Author SHA1 Message Date
silicons
04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki 
Updates the clockcult help link to link to our wiki.
 2020-08-18 18:53:21 -07:00
silicons
0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum 
Revert "[TESTMERGE ONLY] FUCK"
 2020-08-18 18:52:52 -07:00
silicons
ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
timothyteakettle
46a464d3b8 no it also cant be sentient 2020-08-19 02:26:08 +01:00
timothyteakettle
097851cbc4 better name 2020-08-19 02:11:08 +01:00
timothyteakettle
98baa09005 the aforementioned pet changes 2020-08-19 01:47:11 +01:00
Timothy Teakettle
19dce2263d that too 2020-08-18 17:49:01 +01:00
Timothy Teakettle
945ac02152 small error 2020-08-18 17:48:10 +01:00
Timothy Teakettle
264e789c3d yes 2020-08-18 17:38:20 +01:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
lolman360
e00c383b1a Update belt.dm 2020-08-18 20:19:54 +10:00
lolman360
7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360
36bcc3a869 Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb 2020-08-18 18:57:35 +10:00
lolman360
b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
tiramisuapimancer
13609ba6e6 Update ethereal.dm 2020-08-17 23:01:01 -08:00
kiwedespars
bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00
lolman360
325f4eb72e Updates 2 2020-08-18 15:43:44 +10:00
lolman360
3040032409 documentation updates 2020-08-18 15:42:19 +10:00
lolman360
8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360
8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00
lolman360
6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
timothyteakettle
d312a5d639 fix tails 2020-08-18 01:32:06 +01:00
lolman360
93fa8b72b8 w e w 2020-08-18 10:05:54 +10:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
timothyteakettle
47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
Detective Google
b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
DeltaFire
31f1e04654 updates the helpertext in general 
Recollection doesn't actually offer any help anymore and just redirects you to the wiki anyways.
 2020-08-17 17:03:53 +02:00
DeltaFire
c74803dd1a updates the wiki page link 2020-08-17 16:53:49 +02:00
lolman360
2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
SmArtKar
e087845745 reee 2020-08-17 13:32:18 +03:00
silicons
3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons 
slaughter demons to MOB_SIZE_LARGE
 2020-08-17 03:15:16 -07:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
silicons
7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen 
kills an ugly if-chain in inventory code (probably)
 2020-08-17 03:13:48 -07:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter 
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
 2020-08-17 03:13:14 -07:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -07:00
silicons
1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons
83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00