Commit Graph

18830 Commits

Author SHA1 Message Date
CitadelStationBot
c84dda86bc Automatic changelog generation for PR #7699 [ci skip] 2018-11-07 14:05:25 -06:00
deathride58
3da77922ae Fixes stamina not properly affecting non-organic limbs (#7699)
* fixes stamina not properly affecting non-organic limbs

* these arent args on receive_damage im dumb
2018-11-07 12:05:23 -08:00
Poojawa
701b4d8026 makes Nothing an option again (#7702) 2018-11-07 12:05:00 -08:00
deathride58
dae07199ff Merge pull request #7695 from Citadel-Station-13/kevinz000-patch-6
buffs warops
2018-11-06 02:07:55 -05:00
CitadelStationBot
2b3591b3b2 Automatic changelog generation for PR #7696 [ci skip] 2018-11-06 01:07:37 -06:00
deathride58
7cb54b0564 Merge pull request #7696 from ursamedium/manualmirror
Mirror of tg's new gas sprites
2018-11-06 02:07:35 -05:00
deathride58
50c604acc5 might as well since the pr touches this file 2018-11-06 02:07:14 -05:00
CitadelStationBot
d8bc090647 Automatic changelog generation for PR #7659 [ci skip] 2018-11-02 14:53:14 -05:00
deathride58
40dd962a16 Adds a non-vore variant for the medihound sleeper, replaces "Allow medihound sleeper" pref with "Voracious medihound sleepers" pref (#7659)
* The medihound sleeper pref no longer disables use of the medihound sleeper, but rather determines the voracious hound sleeper sprite/flavortext

* Axes stray north/south belly sprites in the nonvore variants
2018-11-02 12:53:11 -07:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
kevinz000
6441592bd2 Update nuclear_challenge.dm 2018-11-01 19:11:48 -07:00
CitadelStationBot
46163a935b Automatic changelog generation for PR #7671 [ci skip] 2018-10-31 19:41:31 -05:00
deathride58
c2bd29ebba Makes mammal tail and mammal ears save again (#7671) 2018-10-31 17:41:28 -07:00
deathride58
598c94ab10 pleases dm langserv while its still fresh in my mind (#7679)
thanks to spacemaniac for helping out
2018-10-30 19:34:17 -07:00
CitadelStationBot
4d990e28c6 Automatic changelog generation for PR #7686 [ci skip] 2018-10-30 21:33:17 -05:00
deathride58
dd1c7c765e Update code/game/gamemodes/revolution/revolution.dm (#7686) 2018-10-30 19:33:15 -07:00
CitadelStationBot
52ae24a977 Automatic changelog generation for PR #7681 [ci skip] 2018-10-30 21:32:37 -05:00
deathride58
1fa2f71577 fixes disarm pushing being able to deal staminaloss to resting targets (#7681) 2018-10-30 19:32:35 -07:00
CitadelStationBot
9a7c06758c Automatic changelog generation for PR #7689 [ci skip] 2018-10-30 21:32:05 -05:00
deathride58
81cb475b2c atomizes some of the med rework's stamina tweaks - you can now scramble on the ground while in hard stamcrit, and the more staminaloss you take while in stamcrit decreases the amount of staminaloss you'll take for the entirety of your time in stamcrit (#7689) 2018-10-30 19:32:03 -07:00
CitadelStationBot
f0913349f1 Automatic changelog generation for PR #7683 [ci skip] 2018-10-30 21:29:11 -05:00
deathride58
4c19f4a50a you're too exhausted to be lifted up - makes it much harder to force someone to stand if they're in hard stamcrit (#7683) 2018-10-30 19:29:08 -07:00
Trilbyspaceclone
e37ccab514 Legit power creep (#7676) 2018-10-30 19:28:25 -07:00
deathride58
91431774ef Merge pull request #7656 from Trilbyspaceclone/Cargo_memes_1
[READY] Cargo packet update and modification
2018-10-30 18:35:23 -04:00
deathride58
3cf9951719 Merge pull request #7680 from Citadel-Station-13/kevinz000-patch-5
Removes vampires from being able to ventcrawl with items while in bat form, makes the bat named after the original mob
2018-10-30 18:34:26 -04:00
CitadelStationBot
b7566dec11 Automatic changelog generation for PR #7675 [ci skip] 2018-10-30 17:34:14 -05:00
deathride58
c337416dd0 Merge pull request #7675 from Tupinambis/Loader
Adds loader engineering cyborg sprite.
2018-10-30 18:34:12 -04:00
CitadelStationBot
90da9670cd Automatic changelog generation for PR #7677 [ci skip] 2018-10-30 17:33:48 -05:00
deathride58
f896a921ba Merge pull request #7677 from Tupinambis/SHODAN
Makes all ion references to "humans" reference to "crew" instead.
2018-10-30 18:33:46 -04:00
deathride58
8341671fa1 Merge pull request #7682 from Trilbyspaceclone/Bloody_bags
Craft-able blood bags!
2018-10-30 18:33:25 -04:00
deathride58
0fb588f459 Merge pull request #7687 from Citadel-Station-13/kevinz000-patch-6
Enables science to fuck up people wasting research points
2018-10-30 18:27:55 -04:00
deathride58
a4188756c3 Okie
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2018-10-30 16:53:58 -04:00
kevinz000
ad05591136 Update rdconsole.dm 2018-10-29 00:26:23 -07:00
Trilbyspaceclone
d4ab22be46 Fail-Coder 2018-10-28 21:23:24 -04:00
Trilbyspaceclone
e721fc3ea3 ^_^ 2018-10-28 21:05:26 -04:00
Trilbyspaceclone
4e4bfe7873 Merge branch 'master' into Bloody_bags 2018-10-28 20:51:53 -04:00
Trilbyspaceclone
ed8f552ba1 Renames 2018-10-28 20:39:52 -04:00
Trilbyspaceclone
b9f196991d Adds in the blood bag 2018-10-28 20:36:59 -04:00
Trilbyspaceclone
5f47e3015f Stuff and bloody things 2018-10-28 20:34:35 -04:00
kevinz000
63173c343c Update vampire.dm 2018-10-28 17:16:51 -07:00
kevinz000
77263f3ee2 Update vampire.dm 2018-10-28 14:05:45 -07:00
kevinz000
6406f04a25 Update vampire.dm 2018-10-28 14:03:38 -07:00
Tupinambis
db74ad4361 Fixes 2018-10-27 23:39:09 -05:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00
Tupinambis
13ee20de7d Adds loader engineering sprite. 2018-10-26 11:31:06 -05:00
Trilbyspaceclone
70e9f5205f Sigh 2018-10-23 15:24:58 -04:00
Trilbyspaceclone
e1f0b364e1 Removes a spare thingy 2018-10-23 15:09:23 -04:00
Trilbyspaceclone
429bcaca2c Fixes what Bejihn wanted and followed the sitcky at the top
"// If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal"
2018-10-23 15:07:13 -04:00
deathride58
fa1dcbe92e Merge pull request #7670 from Trilbyspaceclone/patch-2
Fixes WT-550 Toxic ammo
2018-10-22 22:37:16 -04:00
deathride58
19addaefec Merge pull request #7669 from nik707/suitupgrade
Exosuit sprites have arrived. "Now with more gasmask."
2018-10-22 22:37:02 -04:00