Commit Graph

590 Commits

Author SHA1 Message Date
tkdrg 78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh
Added new event: portal storm.
2016-02-19 21:08:16 -03:00
duncathan salt 6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob
Blobbernauts and blob spores are now immune to blob chemicals
2016-02-19 15:51:41 -06:00
Nerd Lord 37eee7c302 keep the heal effect within the tile okay 2016-02-19 14:02:53 -05:00
xxalpha 1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
Nerd Lord 59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob.
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
2016-02-18 17:11:59 -05:00
xxalpha 1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
phil235 5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235 7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
oranges b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +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 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 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
tkdrg dbf0c75914 Merge pull request #15185 from ChangelingRain/poinomaly
Anomalies now appear on the POI list.
2016-02-05 01:03:46 -03: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 79d7758321 Anomalies now appear on the POI list. 2016-02-03 22:22:42 -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
xxalpha 87abdca865 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-01-31 21:12:18 +00:00
bgobandit 32f862d7c6 Wirecutting posters removes any existing pixel shifts. 2016-01-30 21:47:09 -05:00
xxalpha 3df42cfdba Added new event: portal storm.
need the file of course

world name
2016-01-30 01:23:55 +00:00
oranges d103d6c648 Change spider ghost alert to an in chat one
This could actually benefit from a nice subystem to handle it (calling humanize_from_ghost) on the appropriate atom when the user clicks the link
2016-01-29 15:42:05 +13: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
Razharas 95bdba5ef9 Merge pull request #14912 from ChangelingRain/comment
Blobs now have an animation when attacking a target
2016-01-27 05:16:53 +03:00
Razharas 20bcee4ec0 Further impovements to proximity code
Further impovements to proximity code
Also voice analiser's third mode now remembers the voice properly not
just mob
2016-01-26 21:18:48 +03:00
Razharas 597e965015 Merge branch 'master' of https://github.com/tgstation/-tg-station into Assembly 2016-01-26 07:47:56 +03:00
Razharas 6f8ce47951 New proximity code
New proximity code
2016-01-26 07:47:33 +03:00
Nerd Lord 3166b8344b animation is more visible 2016-01-25 22:59:11 -05:00
Nerd Lord 0de8032983 directed attacks have more alpha 2016-01-25 21:31:36 -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
KorPhaeron 7cebbae3f6 Foamed Metal 2016-01-24 19:40:02 -06:00
xxalpha 6aaf9c43a6 Made foam transparent and changed its layer to be above mobs. 2016-01-22 23:57:18 +00:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Razharas 4aea0db29b Merge pull request #14120 from duncathan/listmos
[READY] Listmos & "Datum Gases"
2016-01-15 11:58:05 +03:00
duncathan salt bcdb01caba Merge pull request #14557 from Buggy123/patch-1
Graffiti no longer explicitly stated to be drawn with crayons.
2016-01-14 17:04:02 -06:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
Nerd Lord fed4212716 Updates guardian HUD button icons.
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.

Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
2016-01-12 16:39:08 -05:00
Buggy123 692d3a6100 Fuck it just genericize the description. 2016-01-10 18:46:38 -05:00
Buggy123 18bab22f25 New spraypaint decal 2016-01-10 18:23:43 -05:00
Buggy123 ebb7e62edc Update crayon.dm 2016-01-10 02:54:22 -05:00
Buggy123 30ceab8c19 Spraypainted stuff no longer appears to be drawn with crayons. 2016-01-10 02:33:07 -05:00
tkdrg 24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer
Walls are a slightly higher layer than floors
2016-01-09 18:41:59 -03:00
KorPhaeron 1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
duncathan salt 18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix
Cockroach guts fix
2016-01-06 22:50:15 -06:00
swankcookie 98d4b9076d Moves contraband to a more fitting location
Signed-off-by: swankcookie <__X__>
2016-01-06 22:12:00 -06:00
swankcookie d4c3048a31 Removes redundant anchor tags
Signed-off-by: swankcookie <__X__>
2016-01-06 22:08:17 -06:00
swankcookie a7508350e5 Gives /cleanable.dm "anchored = 1" 2016-01-03 20:43:48 -06:00
MrStonedOne b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
duncathan b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00