Lin
9f443c9285
Merge pull request #15362 from Putnam3145/teg-fix
...
Makes TEG generate heat based on actual heat transfer (again)
2021-11-13 04:42:53 +00:00
Putnam3145
71e6676e9a
(
2021-11-11 17:53:00 -08:00
Putnam3145
a3b6ac7b54
Fixes freezer display + fixing bad math
2021-11-11 17:46:48 -08:00
Putnam3145
be9f550261
removed gross extra space
2021-11-11 17:43:38 -08:00
Putnam3145
25687a81f0
Makes TEG generate heat based on heat again
2021-11-11 17:38:49 -08:00
Putnam3145
0b0a7192f9
removes the "REM" macro
2021-11-09 16:35:32 -08:00
Lin
93eb2ae444
Merge pull request #15346 from Putnam3145/last-lung-fix-bluh
...
Fixes simultaneous suffocate/overbreathe
2021-11-09 03:37:03 +00:00
Putnam3145
da138b1b37
why did i think i could remove this
2021-11-07 16:47:57 -08:00
Putnam3145
aa619e8a3a
Fixes simultaneous suffocate/overbreathe
2021-11-07 15:33:08 -08:00
Putnam3145
3c8bab34b2
Also makes destroying the APC show an alert properly.
2021-11-07 09:29:15 -08:00
Lin
a17d730ed8
Merge pull request #15336 from timothyteakettle/marking-fix
...
fixes red panda head marking
2021-11-07 00:42:59 +00:00
Lin
3d19f6d292
Merge pull request #15334 from Putnam3145/another-lung-fix
...
More lung fixes
2021-11-05 16:52:00 +00:00
Timothy Teakettle
8ef2ec4ac8
Update body_markings.dm
2021-11-05 15:38:25 +00:00
Putnam3145
b2459a26a3
Merge pull request #15306 from keronshb/dynamicadjustments
...
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
2021-11-04 16:27:58 -07:00
Putnam3145
798f1ae879
and fixes suffocation with literally 0 gas
2021-11-04 09:04:48 -07:00
Putnam3145
f83cd7b57d
Lung changes: reckoning
2021-11-04 08:52:50 -07:00
Lin
74c6e05dd7
Merge pull request #15318 from silicons/evil
...
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
Putnam3145
aba3720f22
Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
...
readds gps to bdm
2021-11-01 17:08:33 -07:00
DrPainis
5cb1388f11
Makes moving NOT give you nutrition anymore. ( #15316 )
...
* makes moving not make you fat anymore
* same as the previous commit, but even less coding
2021-10-30 18:00:13 +02:00
keronshb
b58d3f14a3
More adjustments
2021-10-30 10:24:58 -04:00
silicons
eb7fd90d3f
Update blood_drunk_miner.dm
2021-10-30 03:31:57 -07:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
silicons
319c5e23fe
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
...
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
silicons
739da5d69b
Merge pull request #15313 from DeltaFire15/codemoment
...
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
Lin
5054ea87ce
Merge pull request #15310 from keronshb/jaqincinerator
...
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
DeltaFire
451025af28
fix
2021-10-29 01:42:28 +02:00
keronshb
b2a890269a
Fixes destroy
2021-10-28 15:44:08 -04:00
keronshb
29a39ed9ea
Indestructable change
2021-10-28 15:30:00 -04:00
keronshb
468b4a11ff
More buffs
2021-10-28 11:26:18 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
SandPoot
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
silicons
679189cb3d
Merge pull request #15277 from Hatterhat/autoloom
...
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
silicons
77116e110c
Merge pull request #15293 from Higgin/let-the-bodies-hit-the-floor
...
Makes bodies laying on the ground also act as obstacles to crawling.
2021-10-27 05:12:16 -07:00
silicons
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
WanderingFox95
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
deathride58
34e6187add
Merge pull request #15148 from Citadel-Station-13/silicons-patch-1
...
disables prisoners
2021-10-24 22:02:27 -04:00
Lin
e1aeaa76fd
Merge pull request #15280 from Putnam3145/siphoning-vents
...
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
Lin
5066e34736
Merge pull request #15258 from keronshb/pirate10k
...
Raises Pirate pay rate back to 10000 again.
2021-10-24 15:09:03 -07:00
Hatterhat
5dbadffe6b
wait a fucking second
2021-10-23 18:15:20 -05:00
Hatterhat
21f88e9711
sounb
2021-10-23 17:47:31 -05:00
Hatterhat
73bbe4f694
igons
2021-10-23 17:47:06 -05:00
Hatterhat
4559b680fd
whoops
2021-10-22 22:07:10 -05:00
Hatterhat
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
raspy
921717d9cd
tesla counterplay now accounts for grounding rod capacitor type ( #15291 )
...
* tesla energy loss accounts for capacitor rating
* reverse qdel and energy loss as suggested
Co-authored-by: = <=>
2021-10-23 03:58:39 +02:00
Letter N
5035536311
Clowncar does not ignore airlocks again ( #15220 )
...
* no airlock tomfoolery
* Update clowncar.dm
* Update clowncar.dm
* assuming direct control
fixes inconsistant indentation.
* inverted operators
Co-authored-by: DeltaFire <andreoxgrievous@gmail.com >
2021-10-21 21:03:59 +02:00
Lin
5e964fe98e
Merge pull request #15289 from WanderingFox95/boneglaivesprite
...
Bone glaive sprites didn't show up properly...
2021-10-21 11:19:17 -07:00
Higgin
5c16f13394
Makes bodies laying on the ground also act as obstacles to crawling.
...
Adds proper comments.
2021-10-21 05:52:33 -07:00
