Commit Graph

9486 Commits

Author SHA1 Message Date
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
kevinz000
b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
2019-09-28 00:15:27 -07:00
kevinz000
1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
2019-09-28 00:14:47 -07:00
nik707
3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
kevinz000
06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206
Blood cult altar, forge and archives now use radial menus.
2019-09-26 19:31:36 -07:00
kevinz000
428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209
Reduces holy water message spam for blood/clock cultists.
2019-09-26 19:31:01 -07:00
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04: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
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
Raptorizer
6747918397 Description changes 2019-09-21 19:43:52 -05:00
Raptorizer
82fec870ca Final changes 2019-09-21 19:13:33 -05: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
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
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
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00