Commit Graph

45154 Commits

Author SHA1 Message Date
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
silicons
8291acc074 Merge pull request #15244 from SandPoot/tgui-alerts-and-what-not
TGUI alerts, lists, inputs
2021-10-27 13:33:31 -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
CitadelStationBot
2c50836ab8 Automatic changelog generation for PR #15277 [ci skip] 2021-10-27 07:13:43 -05: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
CitadelStationBot
e2f28e6d2f Automatic changelog generation for PR #15303 [ci skip] 2021-10-27 07:12:24 -05: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
CitadelStationBot
3b58321ce0 Automatic changelog generation for PR #15232 [ci skip] 2021-10-27 07:11:51 -05:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07:00
Changelogs
ce97595abe Automatic changelog compile [ci skip] 2021-10-26 00:26:34 +00:00
CitadelStationBot
1af9c99653 Automatic changelog generation for PR #15290 [ci skip] 2021-10-25 11:11:56 -05: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
Changelogs
8dab29dd8c Automatic changelog compile [ci skip] 2021-10-25 00:28:32 +00:00
Linzolle
a4a72b1b16 make plasmemes not die in ghost cafe 2021-10-24 17:27:32 -07:00
CitadelStationBot
95e743c75e Automatic changelog generation for PR #15280 [ci skip] 2021-10-24 17:09:38 -05:00
Lin
e1aeaa76fd Merge pull request #15280 from Putnam3145/siphoning-vents
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
CitadelStationBot
63923c97c8 Automatic changelog generation for PR #15258 [ci skip] 2021-10-24 17:09:06 -05: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
Changelogs
185b67ad79 Automatic changelog compile [ci skip] 2021-10-24 00:28:06 +00: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
keronshb
ff9439d223 Dsword Wound and slowdown fix 2021-10-22 23:04:19 -04: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
Changelogs
4c19e8a3d6 Automatic changelog compile [ci skip] 2021-10-22 00:31:30 +00: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
CitadelStationBot
5392566369 Automatic changelog generation for PR #15289 [ci skip] 2021-10-21 13:19:20 -05: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
CitadelStationBot
b1fa285286 Automatic changelog generation for PR #15288 [ci skip] 2021-10-21 02:32:51 -05:00
Lin
5012b0acea Merge pull request #15288 from WanderingFox95/Barkboxfix
Small Bark Box Runtime Fix
2021-10-21 00:32:48 -07:00
CitadelStationBot
9ecfb41617 Automatic changelog generation for PR #15209 [ci skip] 2021-10-20 19:49:23 -05:00
Lin
2d439ffc71 Merge pull request #15209 from Putnam3145/more-ashwalker-woes
More ashwalker lung adjustments
2021-10-20 17:49:20 -07:00
Emily
57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02:00
Emily
5b8ecf721d Adds the base tripoly sprite that was absent. 2021-10-20 09:41:35 +02:00
Changelogs
972c90bcad Automatic changelog compile [ci skip] 2021-10-20 00:28:21 +00:00
CitadelStationBot
6394e2514b Automatic changelog generation for PR #15282 [ci skip] 2021-10-19 18:53:43 -05:00
Lin
44e754bbf5 Merge pull request #15282 from Putnam3145/fix-heat-exchangers
Properly implements hysteresis on heat exchanger processing
2021-10-19 16:53:40 -07:00