Commit Graph

39 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
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
PKPenguin321
40941c636d necklaces again
round three let's go
2015-12-16 20:47:00 -08:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
77405d49b0 Tweaks numbers upward. 2015-09-02 14:15:42 -04:00
bgobandit
020ea5d262 Adds materials to some items for recycling purposes. 2015-08-30 14:28:56 -04:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
Wolfie13
22deb5b46e Added Description Text for Pet Collars
Because we know they're not some sort of space-tie.
2015-04-09 04:15:38 +01:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Cheridan
e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Cheridan
f180506a2d finished 2015-03-18 23:59:23 -05:00
Cheridan
7149f0382d Adds Pet Collars!
Map needs update now
2015-03-18 21:27:21 -05:00
tkdrg
f1101f77a9 Adds 3 more scarves
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
tkdrg
eaec9a6e1b 9 more scarves and small corgi cleanup
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
tkdrg
62b99c7007 Adds scarfs
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
paprka
868f29ada7 reverts armband change 2014-12-12 10:53:35 -08:00
paprka
e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
Zelacks
f402b6bfe4 tie fix
i mean i guess this fix is okay
2014-08-15 01:34:22 +08:00
ikarrus
3c96428603 [MAP] Boxstation Update and Deputy Armbands
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
MrSnapwalk
39c155c03a Classy Outfits
Adds formal uniforms, a black tango dress, and a professional black suit
(with added Memorizer for maximum CIA spookyness). To do: make this
stuff orderable from cargo, and add some of it to the lawyer's closet.
2014-03-01 00:30:05 -06:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Mloc-Argent
79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Ikarrus
1518d285e7 Standardized spelling of all instances of "Centcom"
Centcomm/CentComm -> Centcom
centcomm -> centcom
2013-06-17 20:49:01 -06:00
Ikarrus
7694776d1f Added a update_inv_w_uniform(0) to pinning medals, so it shows up on the mob icon. 2013-05-04 11:19:49 -06:00
Ikarrus
e7bcf2dbfc Part one is here: #450
This pull request adds the box of medals to the map (Captain's Office), as well as updating the changelog.html

Also includes minor string and sprite fixes.
2013-04-27 18:43:05 -06:00
Ikarrus
ee19f2fbd7 Medals
-Added a locked box of medals to be placed in the Captain's Office. It contains medals the Captain can award his crew.
-Added pinning medals onto others, provided their jumpsuit is exposed
-Added a message when you try to add an accessory to a jumpsuit that already has one.
-Fixed up emagging lockboxes
2013-04-25 20:08:02 -06:00
d_h2005@yahoo.com
788b2576cd -New sprites for spider cocoons and webs.
-Adds green-striped medbay deptsec armbands, at the behest of ikarrus

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5540 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 09:09:50 +00:00
d_h2005@yahoo.com
c3c1c94d7e -Adds sprites and defines for departmental armbands, attachable to jumpsuits.
-Fixes backwards police-baton inhand sprites.
-Nudges the lusty xeno poster over a few pixels, so it fits better in-game.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5481 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 03:14:35 +00:00
elly1989@rocketmail.com
8be72ec797 Added some stand-in sprites for medals.
They remain admin-spawn only until there's proper sprites for them.
The only one which isn't admin-spawn is the one the captain spawns with (it's on his jumpsuit)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4786 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 20:01:10 +00:00
elly1989@rocketmail.com
00921387e7 Added mob-examine code for ties
Added medals as a type of tie. Awaiting sprites. Need a bronze, silver and gold on-mob sprite. And icons for the items themselves. Don't bother with in-hands

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4783 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 17:42:11 +00:00
elly1989@rocketmail.com
e317396894 Removed the obj/screen/MouseEntered and MouseExited() proc defines as they cause clients to send more data to and from the server fairly constantly and create additional overheads for little purpose. I'll do a poll on the forums to see if people still want the intent switcher changed from a toggle to a 4-quadrant switch thingy like other servers have. From the DM reference:
"Don't define this unless you need it, because it generates extra communication that is otherwise avoided. Defining it on only the objects that require it reduces overhead"
I've tested it and it has these overheads for all hud objects.

Added stethoscopes. They are a tie. You can use them to listen for somebody's pulse. Mostly a RP-fluff item. "You place the stethoscope against her chest. You hear a healthy pulse and respiration." You need help intent and it will give different text for each body-part. I might make it more detailed later.
Removing ties from a uniform will now try to place it in you hands.
Stethoscopes placed in a few places around medbay.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4682 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 14:13:25 +00:00
petethegoat@gmail.com
fc2596f3a3 Added ties. Ties that you can wear.
TIIIIIESSSSS

Currently there are three types, none are on the map, all are fabulous.

Lawyer suits and some others will need updating before they go in.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4611 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-03 02:27:18 +00:00