Commit Graph

16074 Commits

Author SHA1 Message Date
JJRcop febebbd4e3 TED and Chronosuit tweaks
- TED time to kill has been halved
- TED now continually warps you back if you manage to escape, instead of killing you
- TED field is no longer dense
- Chronosuit now does not carry items with you if they are outside the suit, which is the belt, back, and hands.
  \ The TED is an exception
2015-04-26 02:59:11 -04:00
phil235 f23db26b6a Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02:00
kingofkosmos d54509c23f Fix for watertank toggling while buckled. 2015-04-22 18:17:35 +03:00
Cheridan 0fa584263c Merge pull request #9095 from phil235/BundleFix4
Telecom machines and reagent fixes
2015-04-22 08:42:42 -05:00
Jordie 0364a8a1d1 Merge pull request #9091 from xxalpha/fixsyringethrower
Fixed syringes being chambered when stored in a backpack.
2015-04-22 17:50:51 +10:00
Jordie ea9b15780c Merge pull request #9086 from phil235/BundleFix3
bodytemperature and other fixes
2015-04-22 17:50:39 +10:00
Jordie 8a8579d039 Merge pull request #9079 from Thunder12345/mines_refactor
Refactors landmines
2015-04-22 17:50:31 +10:00
Jordie 25d8633300 Merge pull request #9057 from cdepatie/shadowling_fix
fixes shadowling veil not resetting luminosity
2015-04-22 17:50:22 +10:00
Jordie 4c575acbfe Merge pull request #9044 from Incoming5643/donks_will_be_put
Adds the "set round end sound" button to the fun tab
2015-04-22 17:50:10 +10:00
Jordie 1f9351c3fd Merge pull request #8925 from xxalpha/ripped
Low pressure environment Ripley buff & Mecha Mining Scanner.
2015-04-22 17:49:57 +10:00
Thunder12345 6660328854 More landmine variabl-HONK
Gave mines more vars related to their effects, repathed some mines to
make this easier, and added new sound mines, that play a sound when
triggered. Who let that clown in?
2015-04-21 19:36:38 +01:00
Swag McYolosteinen f747ff7246 Merge pull request #9103 from kingofkosmos/girderfastfix
Fixes #9100
2015-04-21 19:26:34 +02:00
Swag McYolosteinen 0e9f2695b1 Merge pull request #9080 from Ikarrus/gangtweaks3
Gang mode changelog and minute tweaks
2015-04-21 17:10:14 +02:00
kingofkosmos 2044f97400 Removed the if(state == 1) from girders. 2015-04-21 06:53:11 +03:00
phil235 8f86c9a178 Reorganized the telecom machines files.
Telecom machines are now deconstructed the same way as all other constructable machine.
Adding new sprites for tcom machines with panel open.
Moving telecom machines sprite to obj/machines/telecomms.dmi
Fixes the effects of smoke/flash/sonic powder when stabilized and then triggered.
Removing overdosing on nicotine.
2015-04-21 01:31:13 +02:00
xxalpha fc8148b496 Fixed syringes being chambered when stored in a backpack. 2015-04-20 21:05:18 +01:00
phil235 d69c7aad52 Woopsie, drugs aren't getting metabolized... 2015-04-20 19:41:57 +02:00
Swag McYolosteinen dc696c16cc Merge pull request #9028 from Fayrik/CentcomExpansion
Centcom change, Deathsquad buff and Abductors get the new advanced camera console.
2015-04-20 19:03:04 +02:00
phil235 658a73d3e8 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix3
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
2015-04-20 18:44:04 +02:00
phil235 fc158ef7bd - crate mimic have wrong icon var. 8953
- fixes constructable chem master icon when parts are exchanged. 8616
- lowers toolboxes inhands sprite, fixes missing one. 8433
- fixes exploit in pandemic to avoid the bottle creation cooldown. 8031
- fixes chem grenade not getting to southwest side. 8019
- remove handle_env, /handle_random_events() and handle_blood at carbon level, identical to living level.
- fixes human bodytemp dropping to 20C in normal environment. (32.5C 90.5F when naked now)
- you now need both adequate headgear+suit to protect against pressure. (removing two defines)
- fixes alien hunter being immune to env fire in stalk mode (removing hunter/handle_env())
- fixes monkey not metabolizing reagents, also make larva metabolize them. 7108
- remove calculate_affecting_pressure from monkey level, simplification.
- refactors monkey's handle environment, no more handle_temp_damage proc, it's all in handle_env.Fixes temperature alert not showing for monkey.
- refactor monkey/handle_fire (similar to alien/human now.)
- replaces morphine with stimulants in adrenal implant. 8832
- refactor handle_breath_temperature.
2015-04-20 18:15:06 +02:00
kingofkosmos e878ca4c8c Fixes #9071 2015-04-20 19:12:27 +03:00
Ikarrus 9c10cec883 Gang mode changelog and minute tweaks
- Gang mode changelog
- Recruitment doesn't cause an obvious seizure any more
- Removed reduced usage on territory spraycans
- Spraycans will notify you if the area you are spraying at is not a valid one for tagging
2015-04-20 08:31:19 -06:00
Cheridan ea5808c1bb Merge pull request #9052 from Incoming5643/slugbugs
Robustifies the head slug mind transfering to hopefully close some edge cases
2015-04-20 08:18:17 -05:00
Cheridan 10450f8915 Merge pull request #9054 from Incoming5643/BugFreeSince2017
Fixes cases where wizards rounds don't end because the crew did naughty things to the corpse
2015-04-20 08:02:55 -05:00
Thunder12345 be6029a659 Now with more (span) class
(user)DANGER (user)DANGER!
2015-04-20 13:02:34 +01:00
Thunder12345 1bf931d731 Refactors landmines
Replaced the minepayload var and the switch() in triggermine() with a
proc for the mine's effect.
Removed unnessecary New() proc.
Removed the existing uglymine icon state and renamed uglyminearmed to
uglymine.
2015-04-20 12:36:06 +01:00
Cheridan c347721a6a Merge pull request #9058 from Ikarrus/gangupdate2
Gang Update v3
2015-04-20 03:24:10 -05:00
Cheridan 201bc0db3f Merge pull request #9040 from phil235/RadFix
Fixes radiation suit not protecting against rads.
2015-04-20 02:02:14 -05:00
Cheridan dc9cf45ba2 Merge pull request #9014 from phil235/Chems
Goon chem fixes and reorganization
2015-04-20 00:17:34 -05:00
Cheridan 652a63c449 Merge pull request #9050 from xxalpha/french_coders
Fixes french invasion.
2015-04-19 23:49:31 -05:00
Ikarrus 4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26:15 -06:00
Cheridan 427c7fa374 Merge pull request #9027 from RemieRichards/FixUndersuitAlternateIcons
Fixes supplying an Alt icon for /clothing/under - Fixes #8413
2015-04-19 15:02:44 -05:00
Cheridan c774eb1184 Merge pull request #9038 from Xhuis/revenant_update_one
Revenant Update I
2015-04-19 14:14:05 -05:00
Fayrik 000dd98573 Fixes a not-so edge case where ERTs and Deathsquads were reporting failure when they were spawned correctly. 2015-04-19 15:22:49 +01:00
Ikarrus af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
Cheridan e6fce017a5 Merge pull request #9026 from Incoming5643/communism_only_works_on_paper
Fixes latejoin rev head promotion
2015-04-19 01:00:56 -05:00
Caden Depatie 8866e6b878 fixes shadowling veil not resetting luminosity 2015-04-18 23:38:57 -04:00
Incoming f04d3a70d8 I thought mind.current was a safe thing to call without a check for its existence.
I thought wrong.

DEAD WRONG.

W2B - Round Code Standardization
2015-04-18 20:40:13 -04:00
Incoming cb1b54174a Robustifies the head slug mind transfering to hopefully close some edge cases where lings somehow managed not to get control of the mob. 2015-04-18 19:30:24 -04:00
xxalpha 1683581578 Omelette du fromage. 2015-04-18 23:03:04 +01:00
Incoming f892127b24 Adds the "set round end sound" fun button so admins can override the generic sounds to play something else if want be. 2015-04-18 15:34:03 -04:00
phil235 4c21750513 Merge branch 'master' of https://github.com/tgstation/-tg-station into Chems
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/carbon.dm
2015-04-18 20:33:19 +02:00
phil235 edba4e0529 Fix reagents not using current_cycle var for their stuff.
Fixes current_cycle being incremented twice for certain reagents.
Fixes flash never working for /datum/effect/effect/system/reagents_explosion because of a typo.
Readding nitroglycerin reagent, it can now be stabilized with stabilizing agent and can explodes when exposed to 474K (like blackpowder).
Readjusted black powder explosion: no more flash (like nitroglycerin), tweaked the values a bit to not nerf blackpowder explosion.
Adding changelog.
2015-04-18 20:30:35 +02:00
phil235 54b0aa852a Fixes radiation suit not protecting against rads. 2015-04-18 18:18:54 +02:00
Xhuis 90ae287e2a Adds changelog 2015-04-18 11:05:25 -04:00
Xhuis e992601abf Fixes initial bugs and makes some changes 2015-04-18 10:59:15 -04:00
phil235 b7db78cbaf Merge pull request #8741 from kingofkosmos/girderrakennus
Girder & machine frame disassembly changes
2015-04-18 13:06:04 +02:00
Swag McYolosteinen fecf02c3ea Merge pull request #8842 from Xhuis/wraith_miniantag
Revenant: A Mini-Antagonist
2015-04-18 10:47:59 +02:00
kingofkosmos ccdb41e6bf state check to disassembling the machine frame 2015-04-18 09:07:47 +03:00
Iamgoofball 7fa33e5b50 Removes chem piles due to exploit.
I'd fix it in the black powder files but @phil235 has them on hold.

Merge ASAP
2015-04-17 16:58:19 -07:00