8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
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
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
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
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
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
cbc266214d
Merge pull request #15303 from Linzolle/ghostcafe-plasma
...
make plasmemes not die in ghost cafe
2021-10-27 05:12:22 -07:00
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
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
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
34e6187add
Merge pull request #15148 from Citadel-Station-13/silicons-patch-1
...
disables prisoners
2021-10-24 22:02:27 -04:00
a4a72b1b16
make plasmemes not die in ghost cafe
2021-10-24 17:27:32 -07:00
e1aeaa76fd
Merge pull request #15280 from Putnam3145/siphoning-vents
...
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
5066e34736
Merge pull request #15258 from keronshb/pirate10k
...
Raises Pirate pay rate back to 10000 again.
2021-10-24 15:09:03 -07:00
53d7682a25
how embarassing!
2021-10-23 20:35:07 -07:00
c26737a533
better rework: based on sec instead of pop on extended
2021-10-23 20:27:38 -07:00
620721e89e
No more "WE NEED ANTAGS" rolls
2021-10-23 19:59:12 -07:00
5dbadffe6b
wait a fucking second
2021-10-23 18:15:20 -05:00
21f88e9711
sounb
2021-10-23 17:47:31 -05:00
73bbe4f694
igons
2021-10-23 17:47:06 -05:00
4559b680fd
whoops
2021-10-22 22:07:10 -05:00
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
ff9439d223
Dsword Wound and slowdown fix
2021-10-22 23:04:19 -04:00
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
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
5e964fe98e
Merge pull request #15289 from WanderingFox95/boneglaivesprite
...
Bone glaive sprites didn't show up properly...
2021-10-21 11:19:17 -07:00
5c16f13394
Makes bodies laying on the ground also act as obstacles to crawling.
...
Adds proper comments.
2021-10-21 05:52:33 -07:00
2d439ffc71
Merge pull request #15209 from Putnam3145/more-ashwalker-woes
...
More ashwalker lung adjustments
2021-10-20 17:49:20 -07:00
57950045a7
Fixes the sprites for wielding.
2021-10-20 10:06:14 +02:00
343689ca42
even more proper
2021-10-19 00:07:14 -07:00
c0db219693
Makes it actually take longer properly
2021-10-18 23:36:53 -07:00
136ca1f107
Merge branch 'master' into more-ashwalker-woes
2021-10-18 04:35:57 -07:00
34936ee5af
Properly implements hysteresis
2021-10-18 03:44:40 -07:00
b593774cc9
Merge pull request #15274 from keronshb/dynamicloneophijack
...
Removes Dynamic's ability to hijack loneop
2021-10-17 19:56:00 -07:00
42da1e2079
Allows setting vents to siphon
2021-10-17 19:55:13 -07:00
8adf4606d7
closes #15279
2021-10-17 23:04:24 -03:00
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
9c45c41d4f
ae
2021-10-16 18:27:59 -05:00
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
f1d5db7983
lol. lmao
2021-10-16 05:02:04 -05:00
7e7a5af53a
brought to you by neilcic - Floor Corn
2021-10-16 05:00:15 -05:00
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
daeaacd81c
Removes Dynamic's ability to hijack loneop
2021-10-15 22:04:01 -04:00
14dee78daf
add extended toggle to dynamic panel
2021-10-15 17:49:20 -07:00
46e5372f10
No anthro icons
2021-10-15 19:57:11 -04:00
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
95bb14bb67
Adds the missing hats, missing wings, and clothes to vendor.
2021-10-15 16:59:16 -04:00
keronshb