Lin
|
efa02148d1
|
Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
|
2021-11-17 16:26:07 +00:00 |
|
Lin
|
4e407ffeb6
|
Merge pull request #15371 from DeltaFire15/unintended-devastation
Devastation level explosions no longer delete organs of gibbed humans
|
2021-11-17 16:19:23 +00:00 |
|
Lin
|
ce1a400617
|
Merge pull request #15373 from DeltaFire15/reebe-testing
Reebe now has a proc to load it
|
2021-11-17 16:15:06 +00:00 |
|
Putnam3145
|
2cdc3a9d30
|
makes regal rat require not being dead to use abilities
|
2021-11-15 21:02:52 -08:00 |
|
DeltaFire
|
cf777da85f
|
success if already loaded
|
2021-11-15 17:54:32 +01:00 |
|
DeltaFire
|
9ae59be10e
|
lies
|
2021-11-14 22:47:35 +01:00 |
|
DeltaFire
|
3f9ad6a954
|
should do this instead
|
2021-11-14 22:44:43 +01:00 |
|
DeltaFire
|
314a3a049f
|
lets just return true instead
|
2021-11-14 22:38:48 +01:00 |
|
DeltaFire
|
50c7d4914f
|
reebe loading (woo)
|
2021-11-14 22:25:39 +01:00 |
|
DeltaFire
|
6224da71a3
|
contents_explosion
at least this one had less overrides.
|
2021-11-14 21:41:42 +01:00 |
|
DeltaFire
|
6aa906395c
|
not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
|
2021-11-14 21:34:59 +01:00 |
|
DeltaFire
|
7d2ff194d1
|
this WILL fail CI
hnnnngh
|
2021-11-14 20:48:41 +01:00 |
|
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 |
|
keronshb
|
efd12e4fd5
|
Changes for merge
|
2021-11-01 12:07:44 -04: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 |
|