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
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
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
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
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
Trilbyspaceclone
9c9e1b1da3
Update life.dm
2019-08-30 09:24:58 -04: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
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Ghommie
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
Linzolle
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
deathride58
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
JTGSZ
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
kevinz000
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
kevinz000
9071917e72
Merge pull request #9088 from Poojawa/blurry-runtimes
...
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
kevinz000
97306ff53c
Merge pull request #9107 from deathride58/fixesarest
...
Fixes handcuffs being impossible to actually resist out of
2019-08-16 16:57:36 -07:00
Poojawa
017a3111ec
Yeah this is a much, much better way of doing it.
2019-08-15 08:37:10 -05:00
Poojawa
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
deathride58
5f6a110f73
Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71
...
Hmm, today the Hierophant will go sicko mode on shaft miners.
2019-08-14 15:43:51 -04:00
Sishen
08bba425e4
run in a straight line to win gamemode lol
2019-08-12 19:42:58 -04:00
kevinz000
a971390cff
Merge pull request #8992 from jakeramsay007/Helmet-Internals
...
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
kevinz000
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00