Commit Graph

981 Commits

Author SHA1 Message Date
xxalpha 7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
Bjorn Neergaard 0f89670107 Prevent picking up anchored items 2016-02-12 01:00:55 -06:00
Bjorn Neergaard ad6f0cb157 Fix some poor intercom code 2016-02-12 00:11:50 -06:00
Bjorn Neergaard 8619725ab0 Prevent monkies/animals from picking up intercoms
WHY ARE THESE NOT ACTUAL MACHINES AAAAA
ANCHORED ITEMS?!

Fixes #15452
2016-02-12 00:05:18 -06:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06: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 7b602a35b5 Merge pull request #15217 from neersighted/flashy
Fix flashlights flashing
2016-02-06 14:21:14 -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 29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard 289f0c19e1 Fix flashlights flashing 2016-02-05 12:06:44 -06:00
tkdrg b3daf4be22 Merge pull request #14981 from neersighted/510
BYOND 510
2016-02-05 00:04:59 -03:00
Bjorn Neergaard ac03d5f617 Fix flashlights actually stunning
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
2016-02-04 20:50:26 -06:00
phil235 1be9855d4f Merge pull request #15174 from kingofkosmos/healthanalyzerhealthfix
Health analyzer percentage fix
2016-02-05 02:07:57 +01:00
Bjorn Neergaard 7a47b43c53 Re-implement screen overlays
This fixes 510 showing all overlays in the rightclick menu
2016-02-04 17:19:44 -06:00
kingofkosmos a251e61621 Reverts the span change in time of death. 2016-02-04 19:50:08 +02:00
phil235 16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01: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
tkdrg 836322a2ea Merge pull request #15067 from KorPhaeron/chameleon
Fixes chameleon projector immortality
2016-02-03 21:58:48 -03: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
kingofkosmos 92dfa8df98 Makes health analyzer show an actual percentage of the analyzed mob's health. Also fixes the span in time of death. 2016-02-03 20:55:24 +02:00
xxalpha 9154e6cbf2 ultra range again 2016-02-03 07:58:41 +00:00
Fayrik a674179746 Now using attack logs for pai history. PAI to pAI. Removed unnecessary spacing on if statements. 2016-01-31 19:29:36 +00:00
Fayrik b9162fbb3e Tweaked card ejection slightly. 2016-01-31 00:25:51 +00:00
Remie Richards 43f9c228de Merge pull request #15042 from ChangelingRain/swarmoverlays
Fixes a few things to use temporary overlays
2016-01-30 18:39:56 +00:00
KorPhaeron da6d81a49b Fixes chameleon projector immortality 2016-01-30 00:06:30 -06:00
Nerd Lord 7feff1605f get turf not loc 2016-01-29 14:12:17 -05:00
Nerd Lord a401975b0e Fixes a few things to use temporary overlays 2016-01-29 14:02:41 -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
tkdrg 0dda9b993b Merge pull request #14930 from Shadowlight213/Janiborglightbuff
Greatly decreases janiborg light replacer refill time.
2016-01-28 19:30:16 -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 d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
duncathan salt fd6482f8cb Merge pull request #14905 from Razharas/Assembly
Some assembly requaired
2016-01-27 08:03:00 -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
Shadowlight213 3a1411b3bb Greatly decreases janiborg light replacer refill time. 2016-01-25 23:31:02 -08:00
Kyle Spier-Swenson 477d686ace Makes the power sink warn at 98% rather than 95%
To account for the higher capacity
2016-01-25 21:27:18 -08:00
Kyle Spier-Swenson 55bfaa7f19 Buffed drain rate a bit more. 2016-01-25 21:22:51 -08:00
Razharas 6f8ce47951 New proximity code
New proximity code
2016-01-26 07:47:33 +03:00
Kyle Spier-Swenson f82cbe74b9 Mades the boom bigger since it holds more now. 2016-01-25 20:23:34 -08:00
Kyle Spier-Swenson 68b0fa6b63 Properly fixes power sinks
Why the fuck would you have this functionality where they can be overloaded if you are gonna raise the numbers so high as to make it useless.

Goofball please.
2016-01-25 17:34:56 -08:00
Bjorn Neergaard 03d93bbf8b Close UIs passed in, don't use tgui internals 2016-01-25 12:03:19 -06:00
Bjorn Neergaard 961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Cheridan b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys
Fixes some awful defines to not be hacks
2016-01-24 21:15:14 -06:00
AnturK 9e8eca56a7 Adds AI card tgui
Removes the multiple AI's on one card semi feature.
2016-01-24 12:52:31 +01:00
MrPerson e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08:00
Bjorn Neergaard 1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard 99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
Bjorn Neergaard 4ec75a5ecb Add better pizza bomb sprites 2016-01-22 19:22:10 -06:00