Poojawa
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
kevinz000
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
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
Fermi
391af0f946
I have no idea why the brain doesn't decay, but this seems to fix it.
2019-09-28 07:26:59 +01:00
Poojawa
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
Fermi
d44fbd3fb1
Brain fix
2019-09-27 23:46:44 +01:00
Fermi
b622ea4fd2
Fixes
2019-09-27 13:49:25 +01:00
Thalpy
1bdb66d5de
Okay a few things I just saw
2019-09-27 07:28:02 +01:00
kevinz000
436e01ed0e
Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
...
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
Fermi
60adaa9f1b
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-26 08:44:21 +01:00
JTGSZ
5b3f6dca29
Species Job Check
2019-09-23 23:58:57 -04:00
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
XDTM
947bb8cc69
port muscled veins too why not
2019-09-22 19:59:17 -05:00
Linzolle
6f4ba5a1b8
make it actually work lol
2019-09-22 19:47:41 -05:00
Jack Edge
4b36e6263e
ABDUCTOR SHIT I GUESS
2019-09-22 18:36:27 -05:00
moo
3c526d9dbd
Dissection Examine + Logic Fix + Ayy ( #45807 )
...
clDissectby
add: Examining a dissected body will provide insight on the highest tier performed.
fix: You can do ayy dissection now if you get the tech
fix: FINALLY fixed the surgery logic correctly
/cl
2019-09-22 18:31:13 -05:00
Linzolle
4878472aa4
fixes
2019-09-22 17:39:37 -05:00
AnturK
12a691d950
Surgery cleanup ( #40788 )
...
* Surgery cleanup
* Proper mobtype
2019-09-22 12:05:26 -05:00
lolman360
6598a8c9c2
Pooj
2019-09-22 16:18:15 +10:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05: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
Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01: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
Thalpy
e043706ff5
No src
2019-09-21 09:47:53 +01:00
kevinz000
30fa8d8231
Merge pull request #9293 from Ghommie/Ghommie-cit195
...
leftover legcuffs/handcuffs overlays fix.
2019-09-21 01:38:14 -07:00
skoglol
c1e84774ac
one-hand shit
2019-09-20 17:28:44 -05: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
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
Fermi
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
Fermi
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
Fermi
d2c49d7987
On_mob_dead!
2019-09-19 20:30:35 +01:00
Thalpy
641196b9dd
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-19 19:57:57 +01:00
Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
XDTM
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05:00
Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
BurgerLua
9003404ea8
Further tweak
2019-09-18 15:16:02 -07:00
BurgerLua
fe3117a006
Added Jetpack Tweaks
2019-09-18 14:49:00 -07:00
deathride58
d0296a5e81
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 20:15:06 -04:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
92218d0213
doing the little things
2019-09-16 17:59:04 -05:00
Poojawa
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
Poojawa
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
Ghommie
f3a5e2e321
leftover legcuffs/handcuffs overlays fix.
2019-09-15 20:30:10 +02:00
Ghommie
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
Poojawa
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
