Commit Graph

4186 Commits

Author SHA1 Message Date
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
phil235 bab61203de Merge pull request #9090 from RemieRichards/PortVGVentcrawling
Ports VG's ComicIronic's awesome ventcrawling overhaul.
2015-04-26 20:49:35 +02:00
Remie Richards 504a139364 Reworked remove_ventcrawl() to be safer 2015-04-26 19:14:56 +01:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
Remie Richards 3b14aca5ae Merge branch 'master' of https://github.com/tgstation/-tg-station into PortVGVentcrawling
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-04-26 15:31:45 +01:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
phil235 236db87ac8 Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity. 2015-04-25 18:28:29 +02:00
Jordie 34c810536c Merge pull request #9124 from naelstrof/master
Fixed being unable to upgrade grabs with hotkey.
2015-04-25 19:14:25 +10:00
Jordie 8ff56a17a1 Merge pull request #9033 from Boggart/guitar
Ports Nienhaus's playable guitar and generalizes instrument code.
2015-04-25 19:13:23 +10:00
hornygranny 8e8561eb3e Merge pull request #9108 from Xhuis/revenantExplosionFix
Revenant Update II
2015-04-24 20:04:39 -07:00
Boggart 077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Xhuis efac73a72b Fixes indefinite 'draining' var 2015-04-23 21:18:07 -04:00
Xhuis 0798a873f2 Merge remote-tracking branch 'remotes/upstream/master' into revenant_update_ii 2015-04-23 21:17:15 -04:00
Remie Richards 5ee50a387f Tweak to Login() call of update_pipe_vision() 2015-04-23 15:25:56 +01:00
Remie Richards cd7abf9942 Fixes cases of mobs not seeing pipe vision. 2015-04-23 15:23:46 +01:00
Dalton Nell a8dd7060d6 Fixed being unable to upgrade grabs with hotkey. 2015-04-22 22:39:12 -06:00
Jordie ea9b15780c Merge pull request #9086 from phil235/BundleFix3
bodytemperature and other fixes
2015-04-22 17:50:39 +10:00
Xhuis 6eec44430a Lots of updates 2015-04-21 20:17:10 -04:00
Xhuis da2ee12552 Fixes revenants being affected by explosions 2015-04-21 18:13:58 -04:00
Remie Richards 0fbdadb4e4 Improves feedback messages. 2015-04-20 22:02:57 +01:00
Remie Richards d7b5ad80a6 When you replace code, you're supposed to remove the old code - Derpfix. 2015-04-20 21:54:08 +01:00
Remie Richards 4b5fcf7969 Prevent exiting/entering Welded atmos equipment. 2015-04-20 21:49:32 +01:00
Remie Richards 6c4ede3fef "Balances" New Scrubber ventcrawling by allowing weldable scrubbers. 2015-04-20 21:21:45 +01:00
Remie Richards b35112282b Ports VG's ComicIronic's awesome ventcrawling overhaul. 2015-04-20 20:39:25 +01: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
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 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
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 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
Swag McYolosteinen fecf02c3ea Merge pull request #8842 from Xhuis/wraith_miniantag
Revenant: A Mini-Antagonist
2015-04-18 10:47:59 +02:00
Fayrik 84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Xhuis a9439151ac Fixed some more issues 2015-04-17 18:06:27 -04:00
Xhuis 6474bb498b Fixes two oversights 2015-04-17 17:29:30 -04:00
Xhuis 2378aa6b65 More progress 2015-04-17 17:26:30 -04:00
Cheridan 123e490994 Merge pull request #8936 from Jordie0608/tfwyoubreakyourownfix
Merges secure closet code into normal closets, fixes overlay bugs
2015-04-17 15:43:40 -05:00
Remie Richards a6f1b8a809 Fixes the ability to supply an alternate icon to jumpsuits (/clothing/under), Incoming's Female uniform stuff was clashing with it. 2015-04-17 21:38:43 +01:00
Remie Richards b08aaa7b63 Merge pull request #8985 from AnturK/camera
Adds Advanced Camera Console
2015-04-17 17:15:04 +01:00
Jordie0608 26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
Conflicts:
	code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235 6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
phil235 a01b8ef435 Reorganizing the reagents files. Goon chems are no longer in separate files.
All reagents are back to being metabolized every tick. I adjusted the goon chem so their effects aren't changed too much.
Removing some probability and randomness from goon chem effects to make it more predictable.
Adding overdose to space drug.
Making a drug reagent category.
Changed check_ear_prot() for carbons: alien are now immune, and monkey checks their head for ear protection.
Changed flashpowder flashing code and blackpowder explosion code to use already existing procs.
Moved chemical_mob_spawn and goon_vortex procs to /datum/chemical_reaction/
Fixes double overdose message for sugar.
Remove the "if(!M) M = holder.my_atom" at the beginning of a lot of on_mob_life procs, you already can't call on_mob_life if M is null

(Chemistry-Holder.dm).
Moved random_color_list to datum/reagent/colorful_reagent
Nerfed healing power of stimulant. Buffed ephedrine a bit.
Fixes some goon chem on_reaction() proc leaving resulting chem behind when they shouldn't.
Removes Life, nitroglycerin and Corgium reagents. They're now only a chemical reaction.
Moved grenade launcher and syringe gun from reagents module folder to gun folder.
Added a message for the ghost when someone is trying to revive its corpse with strange reagent. (like defib)
Fixes Frost oil and other consumable reagents using current_cycle var.
Fixes runtime where during metabolization a reagent removes another then the latter still calls on_mob_life().
2015-04-16 22:07:24 +02:00