Commit Graph

29125 Commits

Author SHA1 Message Date
Neopatra
d4dc3225d8 Adds Security and Medical Taursuits
Riot, Crowd Control, and Vey-Med Included
2017-09-16 13:00:41 -04:00
Belsima
a3bd21c387 Mild changes to alcohol strength + spellcheck. 2017-09-16 12:45:46 -04:00
Woodratt
3e90725a45 Catwalks and Railings
Added catwalks and railings. Ported from Vorestation who ported them from Eris.

Note, catwalks can be placed on plating (as is seen on the vorestation map Tether) and is done so here as well. However it doesn't seem like it is possible to build said catwalks on plating. Did not bother to adjust this at this time. Something to sort in the future.

Adjusted SC station dmm to use both the railing and catwalks as well as a couple fixes for the floor tile adjustment in a earlier commit.
2017-09-16 00:54:33 -07:00
Anewbe
e917fd2cf5 Lets you pet slimes. 2017-09-16 00:46:15 -05:00
Neerti
20831936ba Corrects Borg Light Intensity
Apparently default intensity before the handle_light() change is 1 and not the range repeated, so now it's 1 again.
2017-09-15 23:51:44 -04:00
Anewbe
c0aff71c72 Fixes Dwarf Beard 2017-09-15 22:14:03 -05:00
Anewbe
aa6866bf44 Merge pull request #3684 from Cyantime/detables
Reduces effectiveness of tabling as opening combat move.
2017-09-15 21:55:50 -05:00
Cyantime
49a62057c3 Constructability. 2017-09-15 21:52:35 -04:00
killer653
81f2b21ecf Merge remote-tracking branch 'PolarisSS13/master' 2017-09-15 21:35:02 -04:00
Neerti
55162bb099 Fixes Borg Lighting Conflicts
Borg lights should be functional again.
Being on fire now makes you glow orange instead of white.  Intensity scales based on fire stacks.
2017-09-15 21:21:27 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Anewbe
377e8f15c3 Merge pull request #3838 from Cameron653/master
Removes a comment
2017-09-15 17:52:11 -05:00
Cameron653
2207d55e84 owo whats this 2017-09-15 18:43:43 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Belsima
8b130ce221 Replaces the sound mice make when you step on them. 2017-09-15 18:13:19 -04:00
Mechoid
9373917b5c Makes Prometheans process various Toxins differently. Step One. (#3815)
* Makes Prometheans process various and base toxins differently.

* Tweak Slime jelly again
2017-09-15 17:00:48 -05:00
Belsima
c5651146fe Adds an icon state for SWAT gloves. (#3832) 2017-09-15 16:58:47 -05:00
Cyantime
965626656b Deconflicts 2017-09-15 15:27:12 -04:00
Cyantime
562d8539af Adds thermal regulators. 2017-09-15 15:23:26 -04:00
Verkister
ad335da4a9 Makes healgurgles nourish hungry full-health prey.
-Ya can now share yer food without having to hurk em up.
-No OP aboos additions here, the nourishment stuff was already a thing with the healgurgs although limited for damaged prey only :v
2017-09-15 13:55:10 +03:00
Belsima
3f853ef1cf Lowers the volume for stepping on mice. 2017-09-14 18:19:09 -04:00
Cameron653
b44c380c13 Pens and needles. Ouch. 2017-09-14 18:13:35 -04:00
killer653
37dbb666ab Adds a slowdown.
Definitely noticable, not deliberating.
2017-09-14 15:57:32 -04:00
killer653
e0eed41f83 Why didn't this save AHHH 2017-09-14 15:34:22 -04:00
killer653
9e4502a09b Adds numbing fangs as a trait 2017-09-14 15:33:58 -04:00
killer653
e40116374b Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NUMBING_BITE_V2 2017-09-14 15:31:17 -04:00
killer653
424500ac65 Gives pAIs the ability to change size. 2017-09-14 15:26:44 -04:00
killer653
e937dc0dd8 Makes it promethean only. 2017-09-14 15:20:50 -04:00
killer653
c295c4452b Merge remote-tracking branch 'refs/remotes/VOREStation/master' into SIZECHANGE_OOC 2017-09-14 15:04:03 -04:00
Anewbe
0af010fd4b Merge pull request #3820 from Cameron653/MEDICAL_TAPE
Adds medical tape
2017-09-14 13:16:42 -05:00
Verkister
6708e45792 cleaning my hands off the lack of fluff directory mess 2017-09-14 13:32:12 +03:00
Verkister
2c2133c098 A miniscule fluff item fix too small to deserve a PR but gets one anyway
-Makes the recent purely cosmetic fluff goggles able to be worn additionally on the extra ear slot and thus not be completely hidden by the character's hairstyles in the "up" state.
2017-09-14 12:14:30 +03:00
Spades
60574b650d Merge pull request #2154 from Cyantime/illegal
Makes the thermal vision NIF software illegal.
2017-09-13 21:22:02 -04:00
Cameron653
b0bbcf83c4 Merge branch 'master' into NUMBING_BITE_V2 2017-09-13 16:16:37 -04:00
Spades
bdf5ce72f8 Merge pull request #2132 from Ketrai/master
adds new event... solargrubs
2017-09-13 16:09:19 -04:00
Spades
4ffab6b629 Merge pull request #2150 from Cameron653/SOULCATCHER_EXAMINE
Allows NIF to show up on examine.
2017-09-13 16:09:12 -04:00
Spades
d517cea2df Merge pull request #2140 from Cameron653/AIRTIGHT_SEC_GOGGLES
Makes sec goggles airtight.
2017-09-13 16:09:03 -04:00
Spades
0f149499a7 Merge pull request #2151 from Cameron653/DHAEL_SQUISH_CODE
Ports insole code from old code.
2017-09-13 16:08:52 -04:00
Spades
81f5f32764 Merge pull request #2158 from Yewmi/horny-demons
Adds new pair of colorable demon horns to species customization
2017-09-13 16:08:33 -04:00
Spades
3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ
Trash pile adjustments
2017-09-13 16:08:14 -04:00
Neerti
194188fe8d Fixes Radiator Pipes 2017-09-13 16:08:13 -04:00
Spades
ce49c5b758 Merge pull request #2152 from Cameron653/LOINCLOTH
Adds a new xeno loincloth
2017-09-13 16:07:46 -04:00
Spades
44e9d90ba4 Merge pull request #2149 from Cameron653/RAHBOOPRED_SPRITES
Rahboopred sprites
2017-09-13 16:07:25 -04:00
Spades
b625bb3ebf Merge pull request #2147 from Gearshy/master
Atmos revamp, part 2
2017-09-13 16:06:58 -04:00
Spades
85b2887ba9 Merge pull request #2101 from Cameron653/JOB_CHANGES
Increase jobslots. Puts job changes in 1 file.
2017-09-13 16:06:00 -04:00
Spades
a5b7908c5d Merge pull request #2097 from kcin2001/Harpy
New Species: Harpy
2017-09-13 16:05:38 -04:00
Gearshy
302d6d62f6 Makes nitrogen tanks bigger 2017-09-13 21:32:44 +02:00
Neerti
47b463f4cb Makes Fire Burn Again
Being lit on fire barely did anything, for multiple reasons, all which should be fixed in this PR.
First, the code to do damage based on bodytemperature was literally bugged and only applied the lowest level of damage, no matter what.
Second, wounds made autohealed them fairly fast, sometimes even outhealing the incoming damage.
Third, being on fire raised your temperature rather slowly.
Fourth, the lowest level of 'overheating' damage was rather low.

Changes:
The bodytemperature part of Life() is now unbroken and I accidentally fixed freezing not hurting, so yay.
Added a ten minute delay to wounds being able to autoheal them away.  Applying bandage/salves will skip this.
Temperature climb is now based on fire stacks while on fire, so more stacks means more and longer pain.
Lowest level of overheating was tweaked.
Running into people while on fire will split your fire stacks with them and light them on fire.
Port's /tg/'s on fire sprite.
Different mobs can have different icons for being on fire.
Bonus: Rejuv now removes pain.
2017-09-13 06:26:08 -04:00
killer653
5d3a64f74c Makes beakers require harm intent to splash/spill 2017-09-13 03:25:22 -04:00
Yumi (AKA Gowst)
40ab778185 Adds outward-facing demon horns 2017-09-12 23:24:50 -05:00