silicons
f8bd6d3f49
Merge pull request #13458 from lolman360/plumbingfix3
...
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
lolman360
9860d296b8
what the fucjk
2020-09-28 14:05:53 +10:00
silicons
ad128c292e
Merge pull request #13351 from Trilbyspaceclone/patch-402
...
Correrts open loop on race drinks
2020-09-11 14:16:33 -07:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
BlackMajor
ac346a7cc9
Merge pull request #13350 from Citadel-Station-13/silicons-patch-32
...
fixes reagent containers doubleattacking
2020-09-08 12:05:29 +12:00
Trilbyspaceclone
917dfdd403
Update alcohol_reagents.dm
2020-09-05 10:38:32 -04:00
silicons
7aa2a89243
Update reagent_containers.dm
2020-09-05 00:23:30 -07: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
