Commit Graph

1633 Commits

Author SHA1 Message Date
AnturK
b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130
[Ready]Tesla balance and code cleanup
2016-02-10 11:36:32 +01:00
Zerrien
79ecd8dde6 Changes the name of bandaid to bandaid_generic, per the code changes 2016-02-10 01:21:39 -08:00
Zerrien
3ff15beb53 Adds two new icons (bandaid_brute, bandaid_burn) for patches 2016-02-10 01:19:49 -08:00
oranges
f14592f69d Don't sleep life for 30 ticks with slimetoxin
This could cause a single users life to delay up to 3 seconds
2016-02-10 14:14:43 +13:00
AnturK
03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak
Adds five new blob chemicals and some blob tweaks
2016-02-09 18:04:55 +01:00
Nerd Lord
6483723c50 Removes unneeded if(M)s.
At least, ones that I *hope* are unneeded.
2016-02-08 22:10:11 -05:00
MrStonedOne
60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
2016-02-07 17:41:42 -08:00
MrStonedOne
eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
Nerd Lord
75bb04d35a less 4-hit crits okay 2016-02-06 20:32:49 -05:00
Nerd Lord
a2b05e14ef Updates Penetrating Spines color, Reactive Gelatin damage. 2016-02-06 19:48:51 -05:00
Nerd Lord
c28c1203cd Adds five new blob chemicals.
Blob mobs now heal for 2.5% of their maxhealth when blob_act()ed, basically whenever they're on the blob
Blob expansion no longer has a chance to fail inversely proportional with the expanding blob's health.
Blobbernauts have slight color differences.
2016-02-06 19:32:30 -05:00
phil235
99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
tkdrg
4e34ca775e Merge pull request #15219 from neersighted/reagents_aaaaaaa
Speed reagent reaction code
2016-02-06 16:15:50 -03:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
302a02aa88 istypeless meme
@RemieRichards
2016-02-05 14:29:53 -06:00
Bjorn Neergaard
1e8ca7193c Speed reagent reaction code 2016-02-05 12:36:35 -06:00
Nerd Lord
f96290ff81 weakens death EMP 2016-02-04 18:54:01 -05:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
Nerd Lord
74bfcb02f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into fixedblobchemicals 2016-02-03 19:43:50 -05:00
phil235
81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
Nerd Lord
af2e2da7cc correct arg and var names, ho 2016-02-03 18:01:38 -05:00
Nerd Lord
7e372d65c3 Tweaks blob expansion to be faster near the expanding blob but slower near the edges of the blob
Blob spores now produce a slightly larger cloud of smoke when dying. Fragile spores and blob zombies produce the current, smaller cloud.

Replicating Foam will try to expand when damaged much more often.
Adds Electromagnetic Web, which does burn damage and EMPs targets, as well as causing a small EMP when dying, but takes more damage; a normal blob that hasn't been near a node or the core for 6~ seconds can be oneshotted by a laser.
2016-02-03 17:15:43 -05:00
Incoming
d659a7d203 Fixes Super Obscure Spray Tan Bugs
Spray tan chem was ineffective on humans because they didn't call the proper update_icon to change the base skin layer.
Races with colors could get to fullblack with careful use of spray tanning
2016-01-30 01:28:21 -05:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components
Fixes #14965
2016-01-28 07:10:37 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
d9162b653c Fix tgui recursion being broken
..() is more elegant after all... You win @RemieRichards
Fixes #14925
2016-01-27 00:52:22 -06:00
Nerd Lord
2d2446a23f synchronous mesh gives you a bad time
fixes overmindless runtime
2016-01-25 21:51:43 -05:00
Nerd Lord
c3699fa909 Blobs now have an animation when attacking a turf
updates a comment for accuracy
incidentally fixes bots to use the overlay instead of setting all the vars then deleting a thing
2016-01-25 21:17:56 -05:00
tkdrg
6a3745c46d Merge pull request #14852 from ChangelingRain/blobbernotagain
Nerfs blobbernaut creation, tweaks blob reagents
2016-01-25 22:00:48 -03:00
tkdrg
391d3ee7dd Merge pull request #14830 from KorPhaeron/welding_tank
Fixes KAs not detonating welding tanks
2016-01-25 00:13:07 -03:00
Nerd Lord
3d9c7eb1a9 synch mesh does more when surrounding, ripping tendrils does less stamina, more brute 2016-01-24 21:58:46 -05:00
Iamgoofball
b92e2109b5 N E V E R 2016-01-24 14:39:08 -08:00
Iamgoofball
946ad1bdde NEVER SPEEDMERGE A GOOFBALL
N E V E R
2016-01-24 14:36:45 -08:00
Nerd Lord
fe006e5c7f Blob tweaks(forever):
blobbernaut creation costs 30 points, does more damage to the factory
factories regenerate at half rate
reagents tweaked;
lexorin jelly does less brute
energized fibers does slightly more burn
sporing pods does slightly more toxin
replicating foam will try to replicate on all hits
hallucinogenic nectar does slightly more toxin and causes more hallucinations
cryogenic liquid does more burn
synchronous mesh does slightly less damage with one blob but massive damage with more blobs
pressurized slime has a lower chance to emit water when killed and when attacking
2016-01-24 16:05:17 -05:00
Iamgoofball
d18710442c cryostal/pyro no longer reacts in NOREACT beakers
final freeze
2016-01-24 12:23:04 -08:00
KorPhaeron
89369815e0 Fixes Welding Tank 2016-01-23 16:19:54 -06:00
Remie Richards
3cb348c477 Merge pull request #14761 from neersighted/tgui
tgui wires; refactor wire datums; more to come
2016-01-23 02:24:34 +00:00
Bjorn Neergaard
1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard
4224c800f0 Rewrite cryo
Similar balance but now healing is all in the reagent; and code is much simplified
Remove cryo leaking air, it just consumes O2 now. Gasses with a higher
specific_heat can be used to improve efficiency.
Greatly buffs cryo upgrades, in return for slight decrease in un-upgraded
performance due to atmos simulation.

Fix canister relabeling icons (Fixes #14742)

Add wrench sound to portable_atmospherics (consistency with ATMOSPHERICS/components)

Fix blood directly setting oxyloss (now uses adjustOxyLoss, balanced to be ~same as before)
2016-01-22 19:25:34 -06:00
octareenroon91
1eee6d0230 make the copypaste work. 2016-01-21 18:54:17 -06:00
octareenroon91
97b781c1e7 Enforce Consistency in Chem Machinery
Chem dispensers, heaters, masters/condimasters, the grinder, and the pandemic will now accept any reagent_container with OPENCONTAINER. This generalizes the code.
2016-01-21 17:23:08 -06:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Bjorn Neergaard
41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard
a1ff8e8783 Refactor tgui interactions
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
2016-01-18 14:27:56 -06:00
Bjorn Neergaard
1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00