Commit Graph

5458 Commits

Author SHA1 Message Date
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
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
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
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
Mervill 9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
oranges 0844b8efed Improves stunbaton code to prevent runtimes and a miscount in charge
Previously if the final stun from a stunbaton used all the power in the
cell (putting it below hitcost) it would not properly return the actual
value of the cell.use call, so you would use the energy but not properly
get the stun

The logic of the deductcharge proc has been refactor to avoid this by
explicitly returning the value of cell.use call no matter if the stun
baton is switched off or not

The code was also cleaned slightly to improve readability
2016-11-07 23:55:19 +00:00
Cheridan 14a7a856bb Merge pull request #21391 from Mervill/grammar
Wayward grammar
2016-11-07 17:49:38 -06:00
oranges 2a8b848f9b Merge pull request #21341 from swindly/its
Fixes some grammatical errors
2016-11-08 09:27:53 +13:00
Aloraydrel c30f34ad90 Analyzer to the CE belt 2016-11-07 08:00:54 -05:00
Mervill f88859309a wayward grammar 2016-11-06 14:53:41 -08:00
Militaires 889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
Cheridan 5d5e4de951 Merge pull request #21372 from phil235/pdapenshit
Pda overlays and pAi fix
2016-11-06 00:12:23 -05:00
Joan Lung 0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit
Easy fix bundle
2016-11-05 19:41:27 -04:00
Cheridan 6a885d9500 Merge pull request #21342 from phil235/TransitShit
Fixes transit tubes
2016-11-05 17:21:24 -05:00
PKPenguin321 43692c6bad buffs whetstones (#21339)
makes it so anything sharpened with them becomes is_sharp_accurate
2016-11-05 14:12:20 +01:00
phil235 93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
phil235 59f2a4e10e Adds some image overlays on PDAs when they had an id (bottomleft corner green light), when their light is on (bottom right corner), when they have an item inserted (top), when they have a pai inserted (screen changes).
Also, altclicking a PDA without an ID now removed the inserted item.
Fixes some bugs. Simplifies id_check() proc.
2016-11-05 03:15:04 +01:00
phil235 b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
swindly 7330ad5778 bonus fixes 2016-11-02 20:08:19 -04:00
swindly 6feff91f76 it's -> its 2016-11-02 19:26:04 -04:00
phil235 26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235 51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Joan Lung ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
oranges 6a411a5a97 Merge pull request #21266 from kevinz000/revert1
Reverts Hardlight Bows
2016-11-01 11:31:40 +13:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Cheridan 2ae59bf7dc Merge pull request #21280 from ChangelingRain/axemeaquestion
Brass windows are now slightly harder to destroy
2016-10-31 11:08:44 -05:00
Cheridan d169779424 Merge pull request #21273 from bgobandit/immortalization
Adds a suicide message to an object lacking one.
2016-10-31 05:07:59 -05:00
Joan Lung 8cf817cfec Brass windows are now slightly harder to destroy 2016-10-30 11:51:21 -04:00
bgobandit 1999445b4f whoopsies 2016-10-30 04:06:06 -04:00
bgobandit 8b01341cfc adds suicide messag 2016-10-30 04:04:23 -04:00
kevinz000 7e364fd79a rip 2016-10-29 20:45:23 -07:00
Kraseo 22ccfd8e62 RIP AND TEAR 2016-10-29 20:46:55 +02:00
Joan Lung df4bc0a093 Fixed a few bugs with clockwork proselytizers (#21221)
* Fixed a few bugs with clockwork proselytizers

* condensed

* formatting

* proselytizer.

* i need more sanity checks I think this crashed something

* proper!

* better desc

* sanity! SANITY!
2016-10-29 11:34:03 +13:00
bgobandit e8f4166849 English and grammar fixes (#21198) 2016-10-29 11:32:04 +13:00
Joan Lung f8ca3860ca Merge pull request #21207 from Niknakflak/finally_getting_to_this
Toys toys toys toys
2016-10-28 15:40:50 -04:00
NikNakFlak 2428844574 Does the thing 2016-10-28 12:33:36 -07:00
kevinz000 bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
erwgd f0f622780e Craft black and fingerless gloves from cloth (#21190)
* moves black shoes recipe to be just below grey jumpsuit recipe
adds recipe for fingerless gloves

* added black gloves recipe

* black gloves require 3 rolls of cloth instead of 2
reduced botanist's leather gloves to only need 150 biomass
2016-10-28 09:58:01 +13:00
Cheridan 2c3b96be8a Merge pull request #21197 from bgobandit/qol
Adds a Centcomm reply admin link to the station charter
2016-10-27 07:59:38 -05:00
swindly 563130d049 Fixes chem implants being unusable (#21180)
* fixes chem implants

* returns TRUE
2016-10-27 10:50:19 +02:00
NikNakFlak 34ba92f82d I forgot a period 2016-10-26 15:35:09 -07:00
NikNakFlak 16ee02c916 Toys toys toys toys 2016-10-26 15:25:28 -07:00
chowdermcarthor c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
bgobandit 202be7c59d Adds a Reply link to station charter 2016-10-26 01:01:57 -04:00
Cheridan ddb4bad29f Merge pull request #21132 from CyberbossJHCB/SanitizeSafe
Secure storage href sanitization
2016-10-23 22:39:55 -05:00
uraniummeltdown 1635017bb2 Atmos Grenades (#21014)
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
2016-10-24 00:15:51 +13:00
Cyberboss 058d1f834f Fixes #20452 2016-10-22 10:28:28 -04:00
Cyberboss 25f31a512e Fixes #11419 2016-10-21 18:45:20 -04:00
phil235 1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00