Commit Graph

20553 Commits

Author SHA1 Message Date
deathride58
efe8d73372 Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39
adds variant of podpersons with 20% brute/burn heal and 70% toxheal and 75% nutrition/light factor of normal for roundstart pod species
2019-05-21 08:04:57 -04:00
deathride58
f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37
Removes firing pins from preprinted gravity guns
2019-05-21 08:04:26 -04:00
kevinz000
55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82
Makes mind shields bomb proof
2019-05-21 00:00:28 -07:00
kevinz000
b2c873edc0 Merge pull request #8371 from Useroth/desword
A weight tweak to d-esword and baseball bat, to make them catch up with the stamina rework.
2019-05-20 23:56:10 -07:00
kevinz000
dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
2019-05-20 23:40:52 -07:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
CitadelStationBot
0f0ed91a62 Automatic changelog generation for PR #8370 [ci skip] 2019-05-21 01:36:58 -05:00
kevinz000
a949295022 Merge pull request #8370 from Trilbyspaceclone/patch-130
Adds a few more mime names
2019-05-20 23:36:56 -07:00
CitadelStationBot
f568c727d0 Automatic changelog generation for PR #8368 [ci skip] 2019-05-21 01:36:44 -05:00
kevinz000
d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128
Adds more clothing to venders
2019-05-20 23:36:42 -07:00
CitadelStationBot
9109445613 Automatic changelog generation for PR #8369 [ci skip] 2019-05-21 01:36:27 -05:00
kevinz000
cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129
Adds more shuttle curse texts
2019-05-20 23:36:25 -07:00
kevinz000
999bb87b4a Merge pull request #8378 from Useroth/nutcracker
Nutcracker. Yes, it's big enough to crush heads.
2019-05-20 23:35:33 -07:00
CitadelStationBot
54bef402bd Automatic changelog generation for PR #8393 [ci skip] 2019-05-21 01:34:40 -05:00
kevinz000
e941901165 Merge pull request #8393 from WhiteHusky/sleeper-blood-levels
Sleepers now show blood level and type for occupants.
2019-05-20 23:34:38 -07:00
CitadelStationBot
43c1dd4aec Automatic changelog generation for PR #8366 [ci skip] 2019-05-21 01:33:30 -05:00
kevinz000
b5918080c0 Merge pull request #8366 from Poojawa/cryopod-mapping-fixes
Cryopod mapping fixes and additions
2019-05-20 23:33:28 -07:00
kevinz000
3ae9661866 Merge pull request #8390 from CalamaBanana/station-charter-apostrophes
Captain's Charter no longer turns apostrophes into "'", too
2019-05-20 23:32:50 -07:00
kevinz000
bcf78736ba Merge pull request #8385 from BlackMajor/Dunga
Adds a cream pie smite.
2019-05-20 23:32:27 -07:00
kevinz000
dff600f1e5 Merge pull request #8389 from CalamaBanana/vote-sound
Plays a harmless sound when a vote is started
2019-05-20 23:31:56 -07:00
CitadelStationBot
2cb3ccbd80 Automatic changelog generation for PR #8376 [ci skip] 2019-05-21 01:31:40 -05:00
kevinz000
733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning
Ports Oracle's cloning tube
2019-05-20 23:31:38 -07:00
kevinz000
a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga
Ling hivemind no longer turns apostrophes into '
2019-05-20 23:30:48 -07:00
CitadelStationBot
bd0aa164db Automatic changelog generation for PR #8392 [ci skip] 2019-05-21 01:30:30 -05:00
kevinz000
74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
2019-05-20 23:30:28 -07:00
kevinz000
bd54053e7a Merge pull request #8375 from Poojawa/signaller-improvements
Singallers are now input instead of button mashing
2019-05-20 23:30:04 -07:00
BlackMajor
80c88a8494 Shit he right 2019-05-21 15:16:51 +12:00
Carlen White
ccef9c326a Sleepers now show blood level and type for occupants.
https://i.imgur.com/RaMjgt2.png

https://i.imgur.com/qkaBggM.png

Also updated TGUI package.json.

_This has been properly resigned with the correct key._
2019-05-20 17:55:25 -04:00
Trilbyspaceclone
d59614a9bb Update cult_items.dm 2019-05-20 15:21:06 -04:00
CitadelStationBot
ce2e980eb3 Automatic changelog generation for PR #8367 [ci skip] 2019-05-20 00:47:04 -05:00
kevinz000
626ede8464 Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
kevinz000
6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
CitadelStationBot
4290d05007 Automatic changelog generation for PR #8372 [ci skip] 2019-05-19 14:47:05 -05:00
kevinz000
d8579b2e2d Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing
Unfucks borg defibs
2019-05-19 12:47:03 -07:00
CitadelStationBot
1ca2dc6ac9 Automatic changelog generation for PR #8374 [ci skip] 2019-05-19 14:46:41 -05:00
kevinz000
1deb83949d Merge pull request #8374 from Poojawa/Heart-attacks
Heart Attacks will murder you now
2019-05-19 12:46:39 -07:00
kevinz000
8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
2019-05-19 12:46:13 -07:00
kevinz000
393d025465 Merge pull request #8382 from CalamaBanana/ear-Skintone-fix
Fixes color of elf ears, using skintone
2019-05-19 12:40:33 -07:00
Useroth
2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
CitadelStationBot
1d8e6a5631 Automatic changelog generation for PR #8377 [ci skip] 2019-05-19 13:14:27 -05:00
deathride58
426033ab9d Merge pull request #8377 from Poojawa/crusher-nerf
Improves Recycler code by making it respect indestructible resistance
2019-05-19 14:14:25 -04:00
deathride58
45602f8a08 Merge pull request #8380 from Poojawa/pipe-fixes
SEENGING PAIPZE
2019-05-19 14:13:06 -04:00
Poojawa
4bd4aa3f6d ohwait, this didn't get included 2019-05-18 23:56:57 -05:00
Poojawa
5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00
Poojawa
8dc5fccfa7 fixes darksabre stuff
adjusts naga sprite. need to make all suits transferred over.
2019-05-18 21:14:19 -05:00
Useroth
a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. 2019-05-18 21:40:43 +02:00
CitadelStationBot
1c608ca910 Automatic changelog generation for PR #8388 [ci skip] 2019-05-18 10:30:12 -05:00
kevinz000
ed4c9506a7 Merge pull request #8388 from Useroth/collars-n-shit
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
2019-05-18 08:30:10 -07:00
CalamaBanana
de841761b2 Charter apostrophes fixed, too 2019-05-18 16:19:25 +02:00
CalamaBanana
4b91eb89b4 Update vote.dm 2019-05-18 16:05:38 +02:00