Commit Graph

29304 Commits

Author SHA1 Message Date
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +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
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
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
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
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
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
Putnam3145
343689ca42 even more proper 2021-10-19 00:07:14 -07:00
Putnam3145
c0db219693 Makes it actually take longer properly 2021-10-18 23:36:53 -07:00
Putnam3145
136ca1f107 Merge branch 'master' into more-ashwalker-woes 2021-10-18 04:35:57 -07:00
Putnam3145
34936ee5af Properly implements hysteresis 2021-10-18 03:44:40 -07:00
Putnam3145
b593774cc9 Merge pull request #15274 from keronshb/dynamicloneophijack
Removes Dynamic's ability to hijack loneop
2021-10-17 19:56:00 -07:00
Putnam3145
42da1e2079 Allows setting vents to siphon 2021-10-17 19:55:13 -07:00
SandPoot
8adf4606d7 closes #15279 2021-10-17 23:04:24 -03:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
Hatterhat
9c45c41d4f ae 2021-10-16 18:27:59 -05:00
SandPoot
17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
SandPoot
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
Hatterhat
f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05:00
Lin
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
keronshb
daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04:00
Putnam3145
14dee78daf add extended toggle to dynamic panel 2021-10-15 17:49:20 -07:00
silicons
e6e0341cd8 Merge pull request #15268 from WanderingFox95/WanderingFox95-BDMFix
Removes the proc loop from the BDM's AI.
2021-10-15 00:19:26 -07:00
silicons
c93fd1b486 Merge pull request #15267 from SandPoot/okay-cool-dynamic,-please-do-not-shove-it-down-my-throat
Removes hardcoded dynamic
2021-10-15 00:19:06 -07:00
silicons
e99688242f Merge pull request #15266 from SandPoot/tiny-sized-fixes
Tiny sized fixes
2021-10-15 00:18:48 -07:00