Commit Graph

29330 Commits

Author SHA1 Message Date
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
Lin
3d19f6d292 Merge pull request #15334 from Putnam3145/another-lung-fix
More lung fixes
2021-11-05 16:52:00 +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
Lin
b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -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
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
silicons
a14549d07b Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07: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
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
e5faee5774 Merge pull request #15254 from Putnam3145/dynamic-better-extended
Dynamic extended: antags allowed, but only later
2021-10-27 05:15:22 -07: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
cbc266214d Merge pull request #15303 from Linzolle/ghostcafe-plasma
make plasmemes not die in ghost cafe
2021-10-27 05:12:22 -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
keronshb
ccb65156ac Adjustments and fixes 2021-10-26 12:53:50 -04:00
keronshb
50986b279e Requirement rework 2021-10-25 21:14:25 -04: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
Linzolle
a4a72b1b16 make plasmemes not die in ghost cafe 2021-10-24 17:27:32 -07: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
Putnam3145
53d7682a25 how embarassing! 2021-10-23 20:35:07 -07:00
Putnam3145
c26737a533 better rework: based on sec instead of pop on extended 2021-10-23 20:27:38 -07:00
Putnam3145
620721e89e No more "WE NEED ANTAGS" rolls 2021-10-23 19:59:12 -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