aa7b9f192f
[MIRROR] harmful var for guns ( #5879 )
...
* harmful var for guns (#36265 )
* harmful var for guns
support for pacifism to use non-harmful guns
* fixes bad spacing
oops
* harmful var for guns
2018-03-10 07:57:57 -06:00
936c6a33f2
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475
2018-03-09 14:18:47 -05:00
1387c8e3b6
Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
...
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
78db80026d
Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
...
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
2f2aed48e4
Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
...
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
0e2531faaf
Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
...
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
e9d3af6e61
The ARM is now harder to obtain ( #36051 )
...
* Added ARM difficulty
* Working edition Pt1
* Actually working Pt2
* Appropriate null check?
* Update narsie.dm
2018-03-09 02:17:46 -06:00
e8548b392b
To go even further byond... the above lighting layer! ( #36106 )
...
* This, is my normal form.
* THIS, IS A SUPER SAIYAN ASCENDED.
I CALL IT A SUPER SAIYAN 2
* Update lighting.dm
* Spelling correction (#3 )
* Update layers.dm
* Update chunk.dm
* TO GO BYOND....
* Update lighting.dm
2018-03-08 22:43:23 -06:00
8c87527005
Minor say code cleanup
2018-03-08 22:43:15 -06:00
0f0ab49648
Update species.dm
2018-03-08 01:03:56 -05:00
e559fdca2c
Mushroom people, revived!
2018-03-07 21:47:42 -06:00
a96a28f3d6
[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-07 20:49:25 -06:00
0941433022
Merge branch 'master' into Filet-o-fish
2018-03-07 10:41:09 -06:00
013c908ebf
Update robot.dm
2018-03-06 23:39:06 -06:00
3c1e557302
compile issues
2018-03-06 22:35:16 -06:00
455ee7e687
modules
2018-03-06 21:45:16 -06:00
d95be2e261
[MIRROR] Allows admins to spawn mob-like objects for shenanigans ( #5825 )
...
* Allows admins to spawn mob-like objects for shenanigans (#36153 )
This is basically extracting the functionality of the animation spell into an admin verb.
Please excuse the browser.dm code, this is more of a stepping stone towards the more complicated popup needed for custom ERTs.
cl Naksu
admin: Admins can now easily spawn mobs that look like objects. Googly eyes optional!
/cl
* Allows admins to spawn mob-like objects for shenanigans
2018-03-06 04:04:12 -06:00
6e5131cfc5
Vore code to json and more ( #5789 )
...
* Vore 2.0
Initial commit
* double checked porting
* Fixes compile issues
* converts Ash Drake bellies to new system
digs out lingering datum/belly stuff too
* Let's just work on this later
* System operational
* Update preferences.dm
2018-03-06 03:59:31 -06:00
954ba91c07
Fucking furries reeeeeeeeeeeeeeeeee
2018-03-05 17:03:33 -06:00
d7f3942129
Revert "Modularize modularize modularize"
...
This reverts commit 8a86cbd307
2018-03-05 16:55:00 -06:00
8a86cbd307
Modularize modularize modularize
...
Quaaaaaaaaack.
2018-03-05 16:52:25 -06:00
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
766b85908e
[MIRROR] Adds the Ancient Cloning Lab ruin ( #5814 )
...
* Adds the Ancient Cloning Lab ruin
* fixes conflicts
2018-03-05 15:20:49 -06:00
848b12db64
[MIRROR] [READY]Hostile mobs can attack assemblies ( #5821 )
...
* [READY]Hostile mobs can attack assemblies (#36157 )
* new fenotype
* attack
* Update items.dm
* Update assemblies.dm
* Update assemblies.dm
* Update items.dm
* [READY]Hostile mobs can attack assemblies
2018-03-05 14:38:30 -06:00
30a4705c01
[MIRROR] Clean up all sorts of crap, mostly defines ( #5788 )
...
* Clean up all sorts of crap, mostly defines
* fixes compile errors
2018-03-05 13:23:28 -06:00
6134f79a26
[MIRROR] Converts several species traits into generic traits ( #5710 )
...
* Converts several species traits into generic traits
* Update traits.dm
* Update mousetrap.dm
* Update corporate.dm
* Update jellypeople.dm
* snowflake fix
2018-03-05 12:34:01 -06:00
61b121a4c9
Dogborg fixes, Borg construction animations! ( #5725 )
...
* major re-works
* Resting verb in, but the icons don't refresh correctly
* tweaks self heal for engiborgs
* minor fixes
* Fixes borg animation flicker
* ore pup stuff, maybe.
* tweaks from upstream input
* adds the basically useless check for dogborg specific modules
* cleans up code and Scrubpup Animation!
* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
7cdeebab69
[MIRROR] Blindfolds properly apply blindness ( #5782 )
...
* Blindfolds properly apply blindness (#36101 )
* blindfolds properly apply blindness
* covering your eyes now applies blindness
* Blindfolds properly apply blindness
2018-03-04 05:26:37 -06:00
143909a855
Update examine.dm
2018-03-02 21:32:07 -05:00
0a449af83e
Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 14:38:18 -06:00
afb1ab021b
Removes SNPCs ( #36016 )
...
* he's dead, jim
* a few stragglers
* Restores the populate world-verb
2018-02-28 00:12:12 -06:00
ff918707ee
[MIRROR] Cleanbot fix ( #5720 )
...
* Cleanbot fix (#36003 )
cl selea
fix: fixed floorbot
fix: fixed cleanbot
refactor: improved pathiding in case of given minimal distance;improved sanitation
/cl
closes #35995 , #35919
* Cleanbot fix
2018-02-27 05:03:42 -06:00
d2607c0654
Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
...
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
621090d54d
Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840
...
[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
2018-02-25 21:42:21 +00:00
44d8fd6085
Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744
...
[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
2018-02-25 21:41:38 +00:00
a75ac3bc13
Removes liver unfailure and makes alcohol do the killing thing sometimes ( #35840 )
...
* - Removes liver unfailure
* - MY LIVER FAILED INSTANTLY
* - Increases liver damage tenfold because whats the point of this pr if you need to drink 100 liters of the toughest booze in the game before you get liver damage
* - Fixes cyber livers not being twice as durable as ordinary livers
- Ok compromise alcohol does twice as much liver damage
- Fixes livers regenerating after they failed
* - I'll be happy if bacchus blessing destroys my liver and absinthe doesn't
* - I think this is the final number I'll punch in. I downed 14 shot glasses of vodka
2018-02-25 14:52:53 -06:00
a7d5e4cdcf
Refactors butchering to a component - item-based butchering effectiveness, speed, and chances ( #35744 )
...
* Butchering component
* auto-butchering based on toolspeed
* Gives drills their butchering back
* redoes toggles
2018-02-25 14:50:29 -06:00
493623c827
Refactors anti-magic into a component
2018-02-25 14:45:51 -06:00
bd6e8f0bbb
Adds limitations to brain traumas ( #35938 )
...
* Adds limitations to brain damage
* no need for these anymore
* a bit harder to gain traumas if you have some already
* (
2018-02-25 11:01:15 -06:00
6ce5985f9f
Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
...
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
759444c148
Removes xeno stun and stamina immunity ( #5616 )
2018-02-23 19:18:52 -06:00
567c7fad8d
[MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold ( #5674 )
...
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796 )
* - Stop subtracting from bodytemp please
- Also fixes shivering
* - Jesus christ why did you make me do this
* - missed one
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
21179c9105
Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
...
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
dfe187ff1c
Slimepeople bugfixes and rebalancing ( #5649 )
...
* Patching damage down to 3x to balance for Pooj's pressure damage increase
* Fixes a bug related to slime change potions
* Fixing conflict
2018-02-22 23:48:56 -06:00
743b1239bb
Fixes dogborg offsets and gun layering ( #5668 )
...
* Fixes dogborg offsets.
* Fixes Dogborg laser overlays
* comment fix.
2018-02-22 23:48:24 -06:00
a39c0ef648
Revert "Slimes have no livers!" ( #5655 )
...
* Revert "Automatic changelog generation for PR #5633 [ci skip]"
This reverts commit c6ad3899d4#5633 )"
This reverts commit 07c7c5e6bf
2018-02-22 23:38:04 -06:00
4d1f93660f
Toxin lovers properly take toxin damage from liver failure ( #35901 )
...
* Toxin lovers properly take toxin damage from liver failiure
* Makes it forced instead of checking for toxinlover
2018-02-22 14:43:47 -06:00
7e5057b99e
fixes arousalloss not being a valid damage type for humans ( #5654 )
...
* goddamnit you broke arousal
* Update species.dm
2018-02-22 12:00:51 -06:00
07c7c5e6bf
Slimes have no livers! ( #5633 )
2018-02-22 01:37:32 -06:00
bc2f2a9728
[READY]Randomized Station Time + Night Shifts
2018-02-21 12:02:28 -06:00
CitadelStationBot