kevinz000
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
kevinz000
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
nik707
6803338df2
Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
...
Fixes the Trek uniform/suit sprites
2019-10-07 18:19:59 -05:00
Ghommie
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
Fermi
79e85e2cfa
Fixes some runtimes
2019-10-04 03:53:02 +01:00
deathride58
2058cbd09f
Merge pull request #9390 from Ghommie/Ghommie_cit212
...
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af
Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes
...
Fixes AIs being unable to talk through holopads
2019-10-03 20:12:59 -04:00
Chayse Ramsay
8cbd7d6c06
Fixes AIs being unable to talk through holopads
2019-10-02 21:14:11 +01:00
Ghommie
4855474955
Making sure altdisarm() works as intended.
2019-10-02 19:39:23 +02:00
Chayse Ramsay
68ca8a5ac0
whoops
2019-10-02 11:55:38 +01:00
Chayse Ramsay
5c827ed8ed
Fixes the Trek uniform/suit sprites
...
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
2019-10-02 04:08:25 +01:00
Ghommie
d2300765b2
adjacency checks.
2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778
reworking the shoving people action.
2019-10-01 23:13:08 +02:00
Ghommie
340f8498a3
Fixes some more issues with shoving people.
2019-10-01 22:11:41 +02:00
kevinz000
250c6ed986
Merge pull request #9367 from Poojawa/totally-radical
...
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Fermi
553818504c
Hoepfully fixes unwanted traumas in the dead.
2019-10-01 06:21:34 +01:00
Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01: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
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
JTGSZ
5b3f6dca29
Species Job Check
2019-09-23 23:58:57 -04: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
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
kevinz000
30fa8d8231
Merge pull request #9293 from Ghommie/Ghommie-cit195
...
leftover legcuffs/handcuffs overlays fix.
2019-09-21 01:38:14 -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
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
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
Poojawa
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
Poojawa
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
Poojawa
0ac3a2307d
Update wings.dm
2019-09-11 17:48:57 -05:00
Poojawa
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00