Commit Graph

23807 Commits

Author SHA1 Message Date
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
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
Cheridan
213d324d5f Merge pull request #15136 from Incoming5643/nonhumanunlessprovenotherwise
Command Roles are properly restricted to just humans
2016-02-02 22:28:18 -06:00
duncathan salt
0915bcf78c Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot
carrot shivs strike back
2016-02-02 19:04:20 -06:00
phil235
bf47c6d356 Merge pull request #15126 from Shadowlight213/Greenmeme
Makes the roundstart intercept report a config option.
2016-02-02 20:58:56 +01:00
tkdrg
fbb207a61e Merge pull request #15110 from KorPhaeron/AI_fix2
Fixes surveillance software
2016-02-01 19:44:55 -03:00
tkdrg
0f47866cad Merge pull request #15122 from JJRcop/bugfixmoji
Fixes emoji issues to do with adminPM and OOC formatting
2016-02-01 19:44:16 -03:00
tkdrg
5884b160ae Merge pull request #15108 from bgobandit/boundname
Soulstones use real_name rather than name.
2016-02-01 19:41:03 -03:00
Incoming
58f3f5207e Command Roles are properly restricted to just humans instead of everything except lizards, catgrills, and plasmamemes (when the config is set for that). 2016-02-01 16:54:07 -05:00
Cheridan
c0211799d3 Merge pull request #15104 from bgobandit/blackslimefluff
Black slime fluff better accounts for lizards.
2016-02-01 15:17:57 -06:00
Shadowlight213
d40cf97500 Changes 2016-01-31 22:26:30 -08:00
tkdrg
a59e7fca43 Merge pull request #15102 from ChangelingRain/runeoverlay
Fixes runes appearing below cult floor glows
2016-02-01 00:01:52 -03:00
tkdrg
f9885841f1 Merge pull request #15074 from Chiefwaffles/Slipocalypse
Adds Uplink Soap Clusterbang for 6TC
2016-02-01 00:01:33 -03:00
duncathan salt
ccba4396b1 Merge pull request #15105 from KorPhaeron/fish
Makes Cayenne a proper carp, adds sentience potion to nuke op uplink
2016-01-31 20:52:00 -06:00
Shadowlight213
f4ec22f405 Makes the roundstart intercept report a config option. 2016-01-31 18:24:34 -08:00
Chiefwaffles
a4d5617289 Changed TC cost to 6. 2016-01-31 18:22:57 -08:00
tkdrg
b10b9e18bc Merge pull request #15101 from bgobandit/fixpixels
Wirecutting posters removes any existing pixel shifts.
2016-01-31 22:44:19 -03:00
tkdrg
0d3e68c1d0 Merge pull request #15099 from PKPenguin321/patch-12
Dice of Fate -> Die of Fate
2016-01-31 22:20:05 -03:00
tkdrg
5e00afd4cc Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF
Adds the ability to store knives/pens/edaggers in certain shoes
2016-01-31 22:00:43 -03:00
PKPenguin321
cdfefbf92b fixes travis
o n e    l i n e    c o m m i t s
2016-01-31 16:26:21 -08:00
tkdrg
faa81107d6 Merge pull request #15079 from KorPhaeron/ctf_bugfix
CTF bugfixes and control point
2016-01-31 21:23:52 -03:00
KorPhaeron
b56879d21e Parentheses 2016-01-31 18:16:05 -06:00
PKPenguin321
eeda4bbd04 updates var names, allows clown shoes to hold bike horns
zilenans around the globe, rejoice
2016-01-31 15:54:32 -08:00
PKPenguin321
616b24dda9 changes istype to is_type_in_list, adds a w_class check
also changes some var names to be less knife-specific and more item-specific
2016-01-31 15:52:11 -08:00
duncathan salt
52e60d80c9 Merge pull request #15089 from Firecage/atmos2modules
Take two of grouping the atmos files in modules.
2016-01-31 17:47:47 -06:00
KorPhaeron
aed4a51223 Restores factions to being lists 2016-01-31 17:46:01 -06:00
tkdrg
90e4457bf2 Merge pull request #15087 from TrustyGun/eroticroleplay
Adds Gag Handcuffs
2016-01-31 20:41:48 -03:00
Razharas
652fe5ddee Merge pull request #15092 from tkdrg/yyyyyyy
[s]Fixes summoning orb exploit
2016-02-01 01:39:42 +03:00
tkdrg
5b74ac82d7 Merge pull request #15031 from Fayrik/riseofthemachines
Adds pAI Control to Simple Robots
2016-01-31 19:02:52 -03:00
Fayrik
e199f81de2 This better be third time lucky. 2016-01-31 21:54:30 +00:00
tkdrg
013016d4f3 Merge pull request #14103 from bgobandit/valentinestuff
Adds valentines and candy hearts for Valentine's Day.
2016-01-31 18:49:28 -03:00
tkdrg
5fed23879f Merge pull request #15093 from ChangelingRain/blobbermaybe
Blobbernauts cost 30 resources
2016-01-31 18:42:42 -03:00
Fayrik
5548180158 Cardpulling works only once now, new proc, removed mulebot emag mode. 2016-01-31 21:12:50 +00:00
Remie Richards
0550e75804 Merge pull request #15039 from Thunder12345/stormtrooper
Adds Syndicate Stormtrooper mobs
2016-01-31 20:50:39 +00:00
Chiefwaffles
170b592377 Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload. 2016-01-31 12:29:00 -08:00
tkdrg
d27426a803 Merge pull request #15043 from KorPhaeron/doomsday
Fixes Doomsday device working off Z1
2016-01-31 17:09:00 -03:00
Remie Richards
8f3245282e Merge pull request #14944 from tkdrg/agoodideaforonce
adminmoreinfo links to antags in ahelp are now red
2016-01-31 19:58:24 +00:00
Remie Richards
7f7cfa1326 Merge pull request #14838 from tkdrg/stealthmin_improvement_improvement
Stealthmin will no longer make humans invisible
2016-01-31 19:58:13 +00:00
Fayrik
261796e6a7 The easy way works better. Whoops. 2016-01-31 19:41:08 +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
TrustyGun
5bbb78024f Removed all instances of the handcuffs from the map and added them to the arcade machine 2016-01-31 14:15:44 -05:00
tkdrg
8c5f3ea143 Merge pull request #15012 from KorPhaeron/title_screen
Allows mappers to set their own title screen for each map
2016-01-31 15:14:17 -03:00
JJRcop
ab99043d31 Fixes emoji issues to do with adminPM and OOC formatting 2016-01-31 12:57:43 -05:00
tkdrg
592b7884dd Merge pull request #15082 from AnturK/ssufix
Fixes #15080
2016-01-31 14:24:34 -03:00
tkdrg
80cb7880ed Merge pull request #15081 from Menshin/astar_passflags
Added passflags checking for A*
2016-01-31 14:11:02 -03:00
tkdrg
9d8275e6e8 Merge pull request #15078 from KorPhaeron/space_suit
Removes inhand slowdown from space suits
2016-01-31 13:58:48 -03:00
tkdrg
c9aef1eb28 Merge pull request #15071 from Incoming5643/goof_creme
Fixes Super Obscure Spray Tan Bugs
2016-01-31 13:57:15 -03:00
tkdrg
2f9cf25120 Merge pull request #15000 from KorPhaeron/hat_buffs
Buffs cakehat
2016-01-31 13:45:55 -03:00
tkdrg
7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg
1158d540de Merge pull request #15058 from erwgd/BotanyToolsShakersForVendors
Added botany tools, salt and pepper shakers to vendors, changed how you get rice seeds
2016-01-31 13:23:21 -03:00