Commit Graph

14998 Commits

Author SHA1 Message Date
kevinz000
a7e7fab301 Merge pull request #9331 from Ghommie/Ghommie-cit201
Fixing machinery's alt-click rotation.
2019-09-23 20:16:35 -07:00
Ghommie
0389293d4a comma 2019-09-24 02:40:43 +02:00
Ghommie
ee8f1022cc Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs. 2019-09-24 02:02:24 +02:00
Ghommie
274fdf8c06 return. 2019-09-24 01:40:48 +02:00
Ghommie
5a822d95a4 M to L 2019-09-23 18:20:45 +02:00
Ghommie
1fa40dac38 Changes. 2019-09-23 17:25:08 +02:00
Ghommie
05a9b63b79 spam. 2019-09-23 17:06:15 +02:00
Ghommie
4795c60670 Reduces holy water message spam for blood/clock cultists. 2019-09-23 16:48:21 +02:00
Ghommie
4b70a9cf67 Makes abandoned crates less prone to explosions. 2019-09-23 03:09:15 +02:00
Ghommie
f37b676a14 runtimes. 2019-09-22 23:38:48 +02:00
Ghommie
a995e161ca more. 2019-09-22 22:36:29 +02:00
Ghommie
a30dbcd721 vars and procs 2019-09-22 22:34:04 +02:00
Ghommie
5b2cc917b3 Blood cult's alter, forge and archives now use radials. 2019-09-22 22:30:44 +02:00
Ghommie
64ce8460c0 a comma. 2019-09-22 14:53:02 +02:00
Ghommie
ff451c8cf4 I don't want to send emoji assets to every machine interfacing with PDA messages.
Just the chat tab.
2019-09-22 14:50:37 +02:00
lolman360
6598a8c9c2 Pooj 2019-09-22 16:18:15 +10:00
kevinz000
e44f52d89a Merge pull request #9122 from Sishen1542/oops-i-did-it-again
nerf gygax melee damage, removes mech KO punches and replaces with extra knockback (and also neuters actuator overload)
2019-09-21 19:07:40 -07:00
kevinz000
72cbaf1307 Merge pull request #9307 from BurgerLUA/Jetpack-Tweak
Reduces jetpack speed bonus on CERTAIN jetpacks while doubling efficiency
2019-09-21 19:04:11 -07:00
Fermi
bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Raptorizer
6747918397 Description changes 2019-09-21 19:43:52 -05:00
Raptorizer
82fec870ca Final changes 2019-09-21 19:13:33 -05:00
Ghommie
bf2f4b5df1 Enables emojis for PDA messages. 2019-09-21 22:42:06 +02:00
Ghommie
33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00
Ghommie
5878fb351e Fixing machinery's alt-click rotation. 2019-09-21 19:56:14 +02:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1
Doubles stamina regen when standing/laying down
2019-09-21 01:48:20 -07:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197
Fixes undershirts n socks colors prefs.
2019-09-21 01:43:10 -07:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94
Fixes clown shoes and work boots.
2019-09-21 01:42:03 -07:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell
Abductor batteries can be used to unlock abductor research
2019-09-21 01:39:08 -07:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195
leftover legcuffs/handcuffs overlays fix.
2019-09-21 01:38:14 -07:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament
ports ligament surgeries as well as dissection
2019-09-21 01:37:47 -07:00
YakumoChen
e297dbd0a3 Update energy_gun.dm 2019-09-21 02:39:47 +00:00
Sishen
43f39a75d6 Update runes.dm 2019-09-20 18:45:44 -04:00
Sishen
37d52239e3 Update runes.dm 2019-09-20 18:39:50 -04:00
Linzolle
deeceafb77 cult fixes 2019-09-20 16:38:37 -05:00
Ghommie
45adfd5bab making it compile. 2019-09-20 23:20:44 +02:00
kevinz000
0a71762444 Merge pull request #9308 from Sishen1542/greyboiz2
fix greyshirt response team
2019-09-20 14:16:17 -07:00
Ghommie
1f2c19c1da ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer. 2019-09-20 22:57:06 +02:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
Fermi
e6a5530363 Fixes 2019-09-20 20:06:38 +01:00
Ghommie
ec9bf9ed17 Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene. 2019-09-20 19:04:28 +02:00
Ghommie
277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-20 02:27:39 +02:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00