Commit Graph

18847 Commits

Author SHA1 Message Date
Redtail e339bcd2ca Added a new carpet
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
deathride58 11acee20e2 Merge pull request #7706 from Citadel-Station-13/kevinz000-patch-7
Fixes the last hard sync nuking the beam rifle nerfs. 160/60 impact/AOE damage reduced to 96/39. Regular blob tiles have 40 health.
2018-11-11 02:33:23 -05:00
deathride58 98b5bb1d5e Merge pull request #7707 from Poojawa/laziness-never-pays-off-take-note-bhjin
Actually test-fixed taur suits this time
2018-11-11 02:32:46 -05:00
Poojawa f03cd4c852 Actually test-fixed taur suits this time 2018-11-10 00:23:42 -06:00
nik707 13cb1d1c8a holy fuck this is broken (#7638) 2018-11-09 19:19:11 -08:00
CitadelStationBot cdff8b2c91 Automatic changelog generation for PR #7688 [ci skip] 2018-11-09 21:11:33 -06:00
deathride58 2676f2a6fc makes it impossible to resist/move out of grabs while resting (though disarming your way out of the grab still works) (#7688)
* makes it impossible to resist out of grabs while resting (partially emulates grab rework's restraining)

* actually wait, *now* you can disarm your way out of grabs

* logging and sounds too
2018-11-09 19:11:30 -08:00
CitadelStationBot 9caf80391b Automatic changelog generation for PR #7694 [ci skip] 2018-11-09 21:10:44 -06:00
izzyinbox 172a46bcbe adds voice of god orgasm and dab commands (#7694) 2018-11-09 19:10:42 -08:00
CitadelStationBot 057bd51c82 Automatic changelog generation for PR #7608 [ci skip] 2018-11-09 21:10:22 -06:00
deathride58 cbc21fe8db okay, let's watch the population drop - adds a config option that makes all stamina buffer actions free (TG-style gameplay) (#7608)
* "sTAM BAD REE" is like sandpaper on my nerves. so let's turn the server into a TG clone for a week and watch as the population dwindles to nothing just to prove a point!

* and the config, too
2018-11-09 19:10:20 -08:00
Trilbyspaceclone b745f56eeb [Ready] Makes PDA notes have basic ship terms that relate to the NSEW form PFBSQ (#7690)
* I thought you said weast

* Weh

* Update code/game/objects/items/devices/PDA/PDA.dm

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2018-11-09 19:09:54 -08:00
kevinz000 5cde0d0401 Update beam_rifle.dm 2018-11-09 19:02:04 -08:00
CitadelStationBot 0583298b4c Automatic changelog generation for PR #7703 [ci skip] 2018-11-08 03:47:11 -06:00
deathride58 a9cc6b0509 fixes job exp requirements by unmodularizing job list defines (#7703) 2018-11-08 01:47:08 -08:00
CitadelStationBot f381da48c2 Automatic changelog generation for PR #7700 [ci skip] 2018-11-07 14:06:13 -06:00
Poojawa e35cd61cc1 Probably fixes rogue icon overrides (#7700)
Taurs should use normal legs to avoid bugs.
2018-11-07 12:06:11 -08:00
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