Commit Graph

45202 Commits

Author SHA1 Message Date
CitadelStationBot
1cc8cc0e28 Automatic changelog generation for PR #15337 [ci skip] 2021-11-06 19:42:21 -05:00
Lin
92a97d7c19 Merge pull request #15337 from timothyteakettle/partypod-sprite
fixes party pod sprite
2021-11-07 00:42:17 +00:00
Changelogs
ed80b98147 Automatic changelog compile [ci skip] 2021-11-07 00:27:56 +00:00
Changelogs
7bc74ab9c0 Automatic changelog compile [ci skip] 2021-11-06 00:25:58 +00:00
CitadelStationBot
117702ad46 Automatic changelog generation for PR #15334 [ci skip] 2021-11-05 11:52:04 -05: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
17f68433e1 Update sleeper.dmi 2021-11-05 15:45:55 +00:00
Changelogs
1df1b680a6 Automatic changelog compile [ci skip] 2021-11-05 00:26:51 +00:00
CitadelStationBot
65667a2665 Automatic changelog generation for PR #15306 [ci skip] 2021-11-04 18:28:01 -05: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
Lin
2f15c67b69 Merge pull request #15326 from dapnee/oopy
Hey, that's not supposed to be over there (More Pubby Fixes)
2021-11-04 04:31:10 +00:00
Changelogs
9a893e7e48 Automatic changelog compile [ci skip] 2021-11-03 00:26:47 +00:00
dapnee
a7017991fc Hey, that's not supposed to over there (More Pubby Fixes)
oh god oh fuck
2021-11-02 14:16:15 -06:00
Lin
8dfd9a496e Merge pull request #15323 from dapnee/oopy
Fixes Table Air Alarm on Pubby and Redundant Fire Lock on Box
2021-11-02 12:54:26 -07: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
dapnee
1101e62503 Fixes Table Air Alarm on Pubby and Redundant Fire Lock on Box 2021-11-01 06:09:44 -06:00
Changelogs
ec560535c4 Automatic changelog compile [ci skip] 2021-10-31 00:28:11 +00:00
CitadelStationBot
3dfc73c91d Automatic changelog generation for PR #15312 [ci skip] 2021-10-30 16:09:01 -05:00
Lin
b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
CitadelStationBot
3e65074649 Automatic changelog generation for PR #15316 [ci skip] 2021-10-30 11:00:16 -05: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
CitadelStationBot
7c02e87338 Automatic changelog generation for PR #15313 [ci skip] 2021-10-29 19:43:15 -05:00
silicons
739da5d69b Merge pull request #15313 from DeltaFire15/codemoment
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
Changelogs
e94aeff48d Automatic changelog compile [ci skip] 2021-10-30 00:26:02 +00:00
CitadelStationBot
94d093c9f2 Automatic changelog generation for PR #15310 [ci skip] 2021-10-28 23:29:53 -05: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
keronshb
133225c083 Removes required enemies 2021-10-28 23:48:50 -04:00
keronshb
02eb4685a9 Some adjustments 2021-10-28 23:44:02 -04:00
DeltaFire
451025af28 fix 2021-10-29 01:42:28 +02:00
keronshb
e531c7b452 Fix 2021-10-28 18:48:26 -04: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
6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
keronshb
468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
keronshb
e8c56c07ee No burning the spirit of halloween 2021-10-28 00:43:02 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb
e469f74dac Merge remote-tracking branch 'upstream/master' 2021-10-27 23:58:50 -04:00
Changelogs
853ff1d8ad Automatic changelog compile [ci skip] 2021-10-28 00:26:44 +00:00
CitadelStationBot
b2fad22bfe Automatic changelog generation for PR #15299 [ci skip] 2021-10-27 15:36:11 -05: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
CitadelStationBot
f97fbd6fe1 Automatic changelog generation for PR #15298 [ci skip] 2021-10-27 15:35:44 -05:00
silicons
9010dc1e41 Merge pull request #15298 from keronshb/whocodedthis
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
2021-10-27 13:35:41 -07:00