Commit Graph

9537 Commits

Author SHA1 Message Date
oranges b5a1746c7e Merge pull request #31408 from ninjanomnom/shuttle-cameras
Makes cameras work on shuttles
2017-10-10 21:14:17 +13:00
oranges ebc430ede1 Merge pull request #31416 from Armhulen/patch-2
Clockwork Golems will not slip on glass
2017-10-10 21:13:37 +13:00
Tad Hardesty 13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
XDTM db0c10ea58 Refactors virus spreading (#31066)
* Refactors virus spreading

* Cyberfixes

* Bump to infect

* proper shoe protection

* Split ContractDisease

* Makes virus severity matter

* oops

* Virus severity changes

* defines

* infective_floor --> infective

* Fixes vomit and pulling infection
2017-10-09 14:08:21 +02:00
XDTM 659081e91c Internals set to 0 pressure will prevent breathing environment air (#31422) 2017-10-08 20:08:43 -04:00
Armhulen e6dc912346 Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 19:30:14 -04:00
kevinz000 1b7962ec9b Update pai.dm (#31379) 2017-10-09 09:47:23 +13:00
AnturK a1cd46c4dd Dedicated equipment removal proc (#31411)
* Dedicated equipment removal proc

* department of redundancy department

* Whitespace makes me angry
2017-10-08 14:17:35 -04:00
AnturK cd28a471df Fixes mob swap on tables. (#31414) 2017-10-08 14:15:35 -04:00
Jordan Brown 0603ad4db0 Merge branch 'master' into codejanitoring 2017-10-07 14:53:43 -04:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
Armhulen a2758b84d9 I NEED MY TOKEN FIX 2017-10-07 07:51:29 -07:00
vuonojenmustaturska 664ce32926 More clutter 2017-10-07 15:44:09 +03:00
ninjanomnom d3b9d8f1d6 cleans up some shuttle camera code and removes a spawn 2017-10-07 02:36:41 -04:00
Jordan Brown 0cf310940b Makes put_in_hands use drop_location() (#31347) 2017-10-06 22:35:48 -04:00
Armhulen e1dbfa81a4 Lightgeists are gold core spawnable (#31344)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.

* ez

* honk
2017-10-06 22:30:13 -04:00
Armhulen e13c9d44d9 Makes Wumborian Fugu gold core spawnable (#31359) 2017-10-06 22:27:39 -04:00
oranges 1a9c302ee1 Fix spelling of conscious 2017-10-06 01:33:32 -05:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Robustin 9837897b2c Emotes now shatter 80% less immersions (#31240)
* Emote Checks by Default

* Removes emote argument

* More emote fixes

* Overhauled emote check

* Closed Spans
2017-10-05 16:10:47 -04:00
Jordan Brown d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit
Does some code standardization/consistency.
2017-10-05 15:53:11 -04:00
XDTM 35d8a55926 Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() (#30525)
* Adds hostile environiment suits

* NOBODY SAW THIS

* the CURSE

* c

* No more stun removal

* fix

* a

* in the chest

* back

* Fixes

* duh

* fucking helmets fucking secbots fucking past coders

* yeah

* REEEEE

* revert to here

* this better work

* cyberboss

* Update effects.dm

* check for charges

* B U L K

* spraycans

* READY

* the if, man

* why the fuck did it convert to spaces

* Fix it
2017-10-05 11:52:47 -04:00
Jordan Brown 3aeb8b363a Merge pull request #31310 from ShizCalev/lobby-timer-fix
Fixes lobby timer showing as delayed when it's just waiting for more players
2017-10-05 10:21:14 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 21:05:16 +13:00
oranges 5ccbcd28d7 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 21:04:20 +13:00
RandomMarine 9dff229cd9 Experimental fix for bloom issue (#31299) 2017-10-05 00:24:01 -04:00
Leo 85d717350d Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 21:25:31 -03:00
ShizCalev cddcbe3e4f Fixes shaking people up while buckled into a bed/resin nest (#31283)
* Fixes shaking people up when buckled into bed

* CB
2017-10-05 11:00:27 +13:00
ShizCalev 61854f7825 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150)
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
2017-10-05 10:29:19 +13:00
kevinz000 aeadbceb27 why plus a minus value and not just minus the value... (#31279)
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
2017-10-04 14:02:44 -05:00
Jordan Brown 32050bed01 Moves laughter to the emote (#31276) 2017-10-04 13:19:18 -04:00
Jordan Brown 95f79435e7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 12:03:32 -04:00
ShizCalev 93dba11648 Simplified further 2017-10-04 10:37:51 -04:00
ShizCalev 63554ed392 Fixes lobby timer showing as delayed when its not 2017-10-04 10:27:27 -04:00
Leo 85b9ba1497 Merge pull request #31256 from ShizCalev/zombie-toxin
Zombies regen toxin damage
2017-10-04 08:14:47 -03:00
vuonojenmustaturska 2ccaee1723 Makes gutlunches hungry for gibs again (#31241)
* gutlunch fix

* combine ifs, removes unneeded check
2017-10-04 11:11:24 +02:00
ninjanomnom 436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
ShizCalev 0ae5cd2d97 Cleans up and fixes old landmarks 2017-10-03 23:38:59 -04:00
Armhulen d75eb9cd1c Gives nightmares a random shadowling name (#31188)
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
2017-10-04 12:40:53 +13:00
KorPhaeron 085632fa63 Nightmare organs (#31034)
* Heart of Darkness

* Forgot the desc

* I'm not good at typing

* Apparently hearts dont actually stop on death

* Sounds

* Special brain

* Fixes being ghosted when turned into a nightmare

* Define

* Typo

* Fixes shadow walk not clearing stuns

* Less hacky brain transfer
2017-10-04 12:20:59 +13:00
KorPhaeron 72389743db ismachinery define 2017-10-03 18:13:21 -05:00
oranges 196f1ddc5e Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
Makes mobs on fire light up
2017-10-04 12:12:49 +13:00
vuonojenmustaturska 69b1c4d24d Greatly speeds up bees (#31250)
* Bee perf

* requested changes
2017-10-03 19:04:02 -04:00
kevinz000 0c47ef3668 fixes healguardians not being able to heal people (#31228)
* Update guardian.dm

* Update support.dm

* Update guardian.dm
2017-10-03 17:48:08 -05:00
KorPhaeron f675778032 Fixes humans having no examine feedback for soft crit (#31247)
* Soft crit examine

* Concise
2017-10-04 09:30:42 +13:00
AnturK 85cd9e60d9 Organ initialization cleanup 2017-10-03 14:17:44 -05:00
Leo 3dbc1c10fd Merge pull request #31210 from MoreRobustThanYou/patch-7
Silicons can no longer take brain damage
2017-10-03 08:19:48 -03:00
ShizCalev 78bcd3f2d5 Zombies regen toxin damage 2017-10-03 01:23:32 -04:00