Commit Graph

3084 Commits

Author SHA1 Message Date
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
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
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
Poojawa 344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -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 2bf4d00d29 Double checking my work 2019-09-12 00:46:18 -05:00
Poojawa 65a89030eb reverts the bleed changes till they can be better tuned 2019-09-12 00:14:26 -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
Linzolle 5ab224e20a tweak values 2019-09-11 11:34:27 -05:00
Poojawa a0decbfd91 Human magic revival does bleeding heal 2019-09-11 04:37:46 -05:00
Poojawa 6353bd1064 Cult heals do bleed stopping
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
Poojawa 8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
Poojawa 88b48ca387 hard caps bleeding rate to 20 2019-09-11 02:37:48 -05:00
BlackMajor 0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
BlackMajor c824f4a6fe Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross 2019-09-09 20:38:51 +12:00
nik707 11846849cf Merge pull request #9249 from Trilbyspaceclone/patch-224
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
kevinz000 7843e070ff Update mob.dm 2019-09-08 12:13:24 -07:00
chefferz d21a45cd53 Doubles stamina regen when laying down/standing
Does as named
2019-09-07 20:07:19 -04:00
Trilbyspaceclone 8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00
Trilbyspaceclone 3c38e6eb3d Update cleanbot.dm 2019-09-06 18:49:42 -04:00
BlackMajor 3e5a192af0 Updates borg examine to also show what module type they are. 2019-09-06 13:31:01 +12:00
BlackMajor cca2001ccb Fixes dogborgs not using their deadsprite 2019-09-06 12:29:36 +12:00
BlackMajor fbc2d3c8fe Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00