Commit Graph

31302 Commits

Author SHA1 Message Date
Cyberboss 75b4b73c50 Fixes #20369 2016-11-11 09:42:45 -05:00
Joan Lung 27cc85535b Merge pull request #21447 from Xhuis/borer_relocation
Moves cortical borer files into the miniantag folder
2016-11-10 19:40:25 -05:00
oranges b54f7365f2 Merge pull request #21448 from ChangelingRain/deathgasp
Fixes deathgasp and gasping not showing up
2016-11-11 12:53:10 +13:00
Xhuis 3207033001 Relocates borers to the miniantags folder 2016-11-10 18:38:52 -05:00
oranges 6fb9a142f8 Merge pull request #21438 from Cyberboss/FacehuggersAgain
Facehuggers can no longer latch onto mobs without a head
2016-11-11 10:42:46 +13:00
oranges a106fecbd1 Merge pull request #21440 from Cyberboss/PhilMakeHulksUseObjDamageAlready
attack_hulk and attack_paw no longer bypass shields
2016-11-11 10:34:29 +13:00
oranges c9728d75f6 Merge pull request #21425 from KorPhaeron/bomblavaland
Bombs are no longer capped on the mining z level
2016-11-11 10:28:56 +13:00
KorPhaeron ac065db80f Captain can buy a new escape shuttle (#21398)
* Captain can buy a new escape shuttle

* A messy way to fix/avoid the issue

* Hopefully fixes potential href exploit

* Makes the code better so oranges wont yell at me anymore
2016-11-11 10:22:46 +13:00
Cyberboss dbadb55f22 Promotion of revheads won't occur if they are restrained/incapacitated (#21436)
* Fixes #21298

* As much as I love runtime station
2016-11-10 15:22:21 -06:00
PKPenguin321 ee0a3ca1fe fixes an accidental removal (#21452) 2016-11-10 15:20:39 -06:00
Cyberboss c2b6730e9a Adds a prototype for dead/impregnated facehuggers. Replaces all existing ones with it (#21434)
* Fixes #21331

* Accidentally commited using -a

* Fixes z5

* Adds one for the impregnated variety as well
2016-11-11 10:20:00 +13:00
Joan Lung 2b7339cec4 You can now repair reinforced walls (#21426)
* You can now repair reinforced walls

* fix

* something something use the right name for your state you butt

* just use inheritance
2016-11-11 10:18:48 +13:00
Joan Lung 045c6e643b Renames Guvax to Geis (#21445)
* Renames Guvax to Geis

* right
2016-11-10 15:18:15 -06:00
Joan Lung ff2e93f69f Only Servants of Ratvar can repair Cogscarabs (#21450) 2016-11-10 15:16:27 -06:00
oranges 934b2b3f1a Merge pull request #21466 from uraniummeltdown/borerfixes
Borer fixes and adjustments.
2016-11-11 09:54:11 +13:00
Cheridan 3866bb482d Merge pull request #21433 from Cyberboss/ForMyBoyPK
Adds logging for shot projectiles
2016-11-10 14:20:25 -06:00
Cheridan 373604639d Merge pull request #21439 from Aloraydrel/CE_BELT
Adds an analyzer to the CE's belt
2016-11-10 12:21:56 -06:00
uraniummeltdown effed6a69f fixed brains with no ckey, made borer roundend report much better, borer total hosts is 1+humans/6 instead of 6+humans/7, hopefully fixed issue with multiple ghosts entering borer 2016-11-10 22:18:56 +04:00
Joan Lung 60d5dcfc39 Merge pull request #21419 from KorPhaeron/immovablerodsarefun
Lets the wizard turn into an immovable rod
2016-11-09 21:42:09 -05:00
Joan Lung 7c4f7e2783 Tweaks reinforced wall descs (#21424)
* Tweaks reinforced wall descs

* imply
2016-11-09 18:48:50 -06:00
KorPhaeron 2b55ef14e3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into immovablerodsarefun
# Conflicts:
#	icons/mob/actions.dmi
2016-11-09 18:43:10 -06:00
KorPhaeron f5e7d48d6b Fix merge conflicts 2016-11-09 18:23:12 -06:00
KorPhaeron c8630e257b Merge remote-tracking branch 'refs/remotes/tgstation/master' into immovablerodsarefun 2016-11-09 18:18:46 -06:00
Joan Lung 7cdf8232ea Fixes deathgasp not showing up 2016-11-09 16:56:20 -05:00
oranges c5c765d62a Merge pull request #21386 from ChangelingRain/sigilfixes
Vitality Matrices will no longer heal dead Servants that they cannot outright revive
2016-11-10 10:42:29 +13:00
Cyberboss 6d1e30b062 Adds an exception for KAs 2016-11-09 16:07:39 -05:00
Joan Lung 5f637d7a0d The Celestial Gateway will now prevent the emergency shuttle from leaving (#21400)
* The Celestial Gateway will now prevent the emergency shuttle from leaving

* no message
2016-11-10 09:36:46 +13:00
Joan Lung 2d765a9197 Refactors some mobcode (#21370)
* Drones wearing hats/masks will get a small portion of the hat/mask's armor

* yesphil

* frameworks are good(?)

* help fruit
2016-11-10 09:34:32 +13:00
Shadowlight213 332598e71d Attacking someone with an extinguisher on help intent only stops it if the safety is off (#21402)
* Removes attacking someone with a fire extinguisher on help intent with safeties on doing nothing.

* Changes so the attack is only blocked if the safety is off.

* FALSE
2016-11-10 09:34:12 +13:00
oranges 8f3713b772 Merge pull request #21428 from Shadowlight213/mindfix
Fixes mindswap
2016-11-10 09:33:45 +13:00
Shadowlight213 19434f7e0b Improves handling for removing ghosts from the observers list (#21422)
* Improves logout handling for removing ghosts from the observers list

* Stuff

* WHERE DID ALL THESE USEFUL DEFINES COME FROM???
2016-11-10 09:33:04 +13:00
Shadowlight213 0c6afbe596 Fixes multihands (#21423)
* Fixes multihands

* Improve multihand attachment

When a new bodypart limb is attached if the hand_bodyparts list is not large enough to accommodate it, it will be resized.

* Whoops

* Whoops again

* I'm doing this to annoy
2016-11-10 09:31:58 +13:00
KorPhaeron 629bfb6c5e Cloaks are now cosmetic neck slot items (#21418)
* Cloaks are now cosmetic neck slot items

* Re-orders layers so bags will display above cloaks
2016-11-10 09:30:25 +13:00
Shadowlight213 c2d0cf3066 Allows the possible roundstart random AI laws to be customized in config. (#21414) 2016-11-10 09:27:57 +13:00
uraniummeltdown ea81370dce Cortical Borers (#21118)
Adds cortical borers, a midround antag originally from Bay. The code here is from yogstation, baystation and paradise station.

Borers are little brainslugs that when adjacent to a human can infest them. They can supply you with useful chemicals such as medicines and meth, and can revive you from the dead if they have maximum chemicals. They can also take over your body, putting them in control of you while you become a "captive mind". A captive mind can take back control by doing Resist. Health analyzers show borers in people, while medHUDs show borers in control. If you have Sugar in your body the borer can do nothing, it gets kicked out of control if it's controlling and becomes docile. Organ Manipulation surgery on head to remove the borer. If the brain of the body gets removed (decapitation, brain removal surgery, gibbing) the borer falls out of the host and loses control if they were controlling. Changelings can remove borers with Anatomic Panacea or Lesser Form (or Last Resort). Borers can reproduce and have an objective to escape on the shuttle with X hosts alive.
2016-11-10 09:25:41 +13:00
Joan Lung 2d3819b3c5 Clockcult is penalized for reciting scripture offstation (#21401)
* Clockcult is penalized for using scripture offstation

* no message

* rrrrr

* check, singular, because there's one

* %
2016-11-10 08:35:13 +13:00
Cheridan 1c04ef3818 Merge pull request #21420 from ChangelingRain/colorfix
Fixes wall runes not properly using the color priority system
2016-11-09 11:15:28 -06:00
Cheridan fb05bc7af3 Merge pull request #21416 from pubby/iv
Set iv_drip density to 0
2016-11-09 11:13:28 -06:00
Cyberboss f1b16c7303 Fixes monkeys too 2016-11-09 11:29:09 -05:00
Cyberboss a712819d06 Fixes #21294 2016-11-09 11:24:43 -05:00
Cyberboss d89afb3fd0 DAMMIT IAN! 2016-11-09 11:00:01 -05:00
Cyberboss f891d7eda5 Fixes #21437 2016-11-09 10:54:57 -05:00
Cyberboss bd9b35456d Fixes #21409 2016-11-09 09:07:04 -05:00
duncathan salt 076d256a47 small atmos changes to transit tubes (#21411)
* small atmos changes to transit tubes, part 1

* small atmod changes to transit tubes, part 2

* Fully remove redundant proc
2016-11-09 10:07:25 +01:00
KorPhaeron 1c88f35f06 Fixes rod form breaking when upgraded 2016-11-08 23:59:44 -06:00
Shadowlight213 fcbd37fb0a DAMNIT JOAN 2016-11-08 20:04:13 -08:00
Razharas 3d3c28efa2 Merge pull request #21407 from optimumtact/martialruntimes
Improves stunbaton code to prevent runtimes and a miscount in charge
2016-11-09 03:26:55 +04:00
oranges cb15ac876b Merge pull request #21396 from KorPhaeron/givethesyndicatebacktheirbomb
Nuke the syndicate base
2016-11-09 12:14:47 +13:00
KorPhaeron 4ccc67ed27 Bombs are uncapped on mining 2016-11-08 16:42:53 -06:00
Joan Lung 7bfa4821e5 Merge pull request #21395 from KorPhaeron/hugboxwalls
You can now examine an r-wall to find out which tool is needed to continue deconstructing it.
2016-11-08 17:25:21 -05:00