Commit Graph

3351 Commits

Author SHA1 Message Date
KorPhaeron 62ce96e20e Adjacency checks 2016-02-24 13:20:12 -06:00
malkevin 8a627b9e66 Cuffs and sec clean up
Sometime last year sec officers lost one of the two pairs of cuffs they started with (I think its when the adv taser was added on spawn, cuffs used to be in the armor slot and were replaced by the taser but never placed anywhere else)
Seeing as cuffs are the only thing stopping sec officers beating the clown to death, I'm readding them.

I've also done a general clean up on sec lockers, removing the extra standard headset (why the f weren't these just replaced by the bowmans in the first place?), and stuffed the locker contents into the sec belts - because fuck the RSI inducing clickfest that is gearing up.
Reordered some of the contents of lockers, again for less repetitive clicks.

Gave the HoS a proper stun baton (I've notice most HoS's pinch a spare one from an officer's locker).
Swapped the detectives collapsible baton for a classic baton, seeing as they're as shit as collapsible batons now and fit the detective's film noir look better. Also gave him some pepperspray because its terrible enough for him to use.

:CL: Malkevin
tweak: Sec officers have two sets of cuffs again (one on spawn, one in locker)
tweak: Done some optimisation of sec spawn equipment lists and lockers to remove some of the repetitive clicking, sec belts are now preloaded with equipment.
tweak: HoS has a full baton instead of the collapsible one
tweak: Detective has a classic police baton and pepper spray instead of the collapsible baton (some made police batons shit, so don't get overly happy)
bugfix: pop scaled additional lockers spawned were the wrong type, changed them to the right type which has batons now.
/:CL:
2016-02-23 21:46:59 +00:00
KazeEspada cd4b5c17ea Tree Cutting. Implements stump sprites. Work in progress on cutting. 2016-02-23 13:57:10 -07:00
KorPhaeron d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
KorPhaeron d217b48ab3 Config does not work for spawning things in lockers 2016-02-22 15:42:07 -06:00
KorPhaeron b278741b19 Door remote config 2016-02-22 14:58:05 -06:00
Cheridan 09252b4f4b Merge pull request #15657 from KorPhaeron/abductor
Abductor Airlocks
2016-02-22 00:05:15 -06:00
phil235 2ec892a1fc Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
Conflicts:
	icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
AnturK 2f688f2b64 Merge pull request #15635 from KazeEspada/barfights2
Bar Fights 2
2016-02-21 19:36:33 +01:00
KazeEspada ac7aed2cb7 Removes parentheses
Really? Really?
2016-02-21 10:56:57 -07:00
KorPhaeron 3f439b211c Abductor Airlocks 2016-02-21 00:01:54 -06:00
Mike Long 97feffe43c Removes compile error 2016-02-20 22:07:02 -05:00
Mike Long d3472dd45e Minor refactor to girder code. 2016-02-20 22:04:46 -05:00
Mike Long b4b3d5bc27 Fixes #15621 2016-02-20 21:50:59 -05:00
KazeEspada 9a33d27e05 Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing. 2016-02-20 14:25:29 -07:00
kingofkosmos 63a6021aa7 Changes a toilet attack message span and changes few instances where using "you" is possible.
Fixes #15637
2016-02-20 15:53:30 +02:00
KazeEspada 116cf0ba77 forgot to commit a file 2016-02-19 22:44:23 -07:00
KazeEspada 40ca05b70d Enhances barfights by making chairs smash against people. If they are weak enough, the act of smashing will knock them on their ass.
Also some backend stuff to make chairs more readable.
2016-02-19 22:15:37 -07:00
KazeEspada 2de3fac2f4 Chairs can no longer be stacked with dense items(rare) or dense structures. As well as chairs. 2016-02-19 20:47:43 -07:00
KazeEspada 4305097ace Properly typecasts user var on place. 2016-02-18 21:56:24 -07:00
KazeEspada fd3557761c Fixes the wrong proc being used. 2016-02-18 20:32:00 -07:00
KazeEspada fff4639bca Fixes an issue where you would plant a chair while moving hands.
Sets the block chance on declaration rather then on instantiation.
2016-02-18 20:29:37 -07:00
phil235 8b2708ff9a Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator). 2016-02-19 02:34:57 +01:00
AnturK 884b6c3415 Chair hitsound 2016-02-18 17:55:39 +01:00
AnturK 56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
phil235 e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
Jordie 3746a65f2e Merge pull request #15454 from neersighted/whoops
Fix deconstructing crates/lockers/closets
2016-02-13 17:22:49 +11:00
Bjorn Neergaard eb228fe342 Fix deconstructing crates/lockers/closets
Fixes #15449
2016-02-12 00:03:39 -06:00
Remie Richards 44b2344925 Merge branch 'backpackssatchelsdufflebagsohmy' of https://github.com/KazeEspada/-tg-station into fucking_kaze 2016-02-12 00:13:03 +00:00
KazeEspada 653902068e You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
2016-02-11 16:48:08 -07:00
Bjorn Neergaard 27a838c17f Fix crate access; fix locker item-to-lock 2016-02-10 17:40:10 -06:00
tkdrg 41901027db Merge pull request #15362 from lzimann/table
Some table fixing
2016-02-10 19:18:32 -03:00
Bjorn Neergaard e4f3045487 Add spacecat
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
2016-02-10 09:15:03 -06:00
Bjorn Neergaard a16f554c35 Allow horizontal mobs to fit into crates
Also make stuffing into crates/lockers a mild stun akin to tabling
2016-02-10 09:14:58 -06:00
Leo 9ff6f0b0b2 Removes return 2016-02-09 19:54:46 -02:00
Lzimann 831d2e04cc Fix tabecrafting menu opening when you click the table
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
2016-02-09 19:46:39 -02:00
Bjorn Neergaard 39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard 209fa5ffe6 Add internals to critter crates; factor more crate code into closets 2016-02-08 01:01:49 -06:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -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
phil235 aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr.
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +01:00
tkdrg e6cb39624e Merge pull request #15208 from KorPhaeron/pinpointer
Gives ops pinpointers by default
2016-02-06 16:27:25 -03:00
KorPhaeron 9b9da55178 Removes excess pinpointers 2016-02-06 11:37:29 -06: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
tkdrg ef62a9ec5e Merge pull request #15169 from lzimann/mechabuff
Makes mech don't suck while destroying walls
2016-02-05 02:44:14 -03:00
Leo 2e3470d736 Removed parent call 2016-02-05 02:18:20 -02:00
Bjorn Neergaard 063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00