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-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,289 Commits 55 Branches 0 Tags
acf06abed5cc10f8ab3ad173fbd4fc355ad64553
Commit Graph

2001 Commits

Author SHA1 Message Date
The0bserver
4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
The0bserver
c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2 
Fix Tea and give them a glass sprite
 2020-08-29 21:33:21 -07:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218) 
* fixes

* fix
 2020-08-25 20:58:20 +02:00
Sonic121x
bfc5be9d8b fix tea 2020-08-22 03:32:42 +08:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
DeltaFire
7a9796e782 minmax torture 2020-08-19 17:05:27 +02:00
lolman360
1654a925b6 Update smoke_machine.dm 2020-08-19 18:26:53 +10:00
lolman360
e82772dc44 kekw 2020-08-19 17:22:52 +10: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
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
kiwedespars
bff11c4fe5 fixes, changes. 
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648)
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629)
- description fixes, eldritch amulet now works.
 2020-08-13 01:12:10 -07:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
lolman360
f10053fe96 suture 2020-08-11 18:03:59 +10:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle
033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
lolman360
6c4c3e4255 lint! 2020-08-10 09:47:55 +10:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro 
Removed (an)aphrodisiacs.
 2020-08-09 05:39:56 -07:00
Letter N
773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
Letter N
5abcc1c220 reverts this change 2020-08-09 12:00:12 +08:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Letter N
5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08:00
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Lin
c310b1a70e Merge pull request #12997 from silicons/lavastaff 
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
 2020-08-05 19:43:38 -05:00
TrilbySpaceClone
5d5459a318 Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea 2020-08-04 10:07:10 -04:00
TrilbySpaceClone
f2e4b7eacc grammer 2020-08-04 10:07:04 -04:00
Trilbyspaceclone
4ea05ab07e Update drink_reagents.dm 2020-08-04 09:33:05 -04:00
TrilbySpaceClone
0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
silicons
20dea7e41f fix 2020-08-01 20:45:49 -07:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb 
tidies up species files
 2020-07-26 22:52:00 -07:00
timothyteakettle
28bf5d2344 remove c 2020-07-26 23:15:56 +01:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
timothyteakettle
3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01:00