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
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
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
XDTM
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05: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
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
Linzolle
5ab224e20a
tweak values
2019-09-11 11:34:27 -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
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
nik707
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
nik707
e943cf0ae8
Merge pull request #9219 from Trilbyspaceclone/patch-219
...
Ports "Fixes slimes not feeding #44760 "
2019-08-31 02:09:15 -05:00
Trilbyspaceclone
9c9e1b1da3
Update life.dm
2019-08-30 09:24:58 -04:00
kevinz000
931527ff7c
Update mob.dm
2019-08-29 22:54:41 -07:00
nik707
36a07f134b
Merge pull request #9208 from Ghommie/Ghommie-cit190
...
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
nik707
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
kevinz000
bea4349056
Merge pull request #9180 from deathride58/buffspoly
...
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
2019-08-27 20:50:59 -07:00
Ghommie
0ffeb704af
Socks color fix.
2019-08-28 05:33:36 +02:00
BlackMajor
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
kevinz000
f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
Linzolle
3e782795dd
get up
2019-08-25 13:14:57 -05:00
Poojawa
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -05:00
Linzolle
955fafee11
make it Work
2019-08-24 23:22:02 -05:00
Linzolle
14ba00d477
shakes my head
2019-08-24 22:21:46 -05:00
Linzolle
9651ae45b1
love to work with merge conflicts
2019-08-24 20:27:47 -05:00
