Commit Graph

1877 Commits

Author SHA1 Message Date
AnturK
8701541d20 Fixes not being able to unbuckle from surgery tables 2016-03-12 21:44:45 +01:00
c0
f3ecb132ba Adds Alien Alloys 2016-03-12 15:06:03 +03:00
KorPhaeron
5420596dd0 Merge pull request #15819 from xxalpha/october_12th_2555
Detective can be a traitor/double agent.
2016-03-11 12:50:32 -06:00
Cheridan
e43b3a891d Merge pull request #15964 from RemieRichards/buckle_many_mobs
Many Buckled Mobs
2016-03-10 08:22:27 -06:00
KorPhaeron
57493aa426 Merge pull request #15855 from kilkun/master
New Human Species Datum
2016-03-08 21:39:46 -06:00
kilkun
1bfa6cf742 Removes species from magic mirrors 2016-03-08 22:24:24 -05:00
Remie Richards
4e821d8657 Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality 2016-03-07 18:03:25 +00:00
Tkdrg
e6c0cd286f Attempts to fix lattices not GCing sometimes 2016-03-05 14:01:06 -03:00
tkdrg
2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
phil235
c76f48e817 derp 2016-03-03 21:08:19 +01:00
phil235
15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
KorPhaeron
0d8c212322 RPD 2016-03-03 03:58:13 -06:00
KorPhaeron
2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
tkdrg
41a42922d2 Merge pull request #15709 from Malkevin/cuffsandclean
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
KorPhaeron
24e3d569f8 Door remotes 2016-03-01 01:43:12 -06:00
xxalpha
6ce6e4f004 Removed Detective's access to security lockers and secbots.
wrong access
2016-02-29 00:42:30 +00:00
tkdrg
9716d1f861 Merge pull request #15787 from KazeEspada/treefixes
Tree Fixes
2016-02-28 21:13:48 -03:00
tkdrg
77b7f02bdd Merge pull request #15775 from AnturK/fix1
Bunch of fixes
2016-02-27 21:27:08 -03:00
KazeEspada
81f60f84f0 fixed an edgecase where you could spam cut a tree and receive multiple logs. 2016-02-26 23:46:09 -07:00
AnturK
59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01:00
Cheridan
2dfebaa77e Merge pull request #15708 from KorPhaeron/sins
Five lavaland ruins
2016-02-26 08:46:32 -06:00
Cheridan
d80756ce9e Merge pull request #15745 from KazeEspada/TreeCutting
Tree cutting
2016-02-26 08:40:29 -06:00
Cheridan
2d9619446f Merge pull request #15733 from phil235/ClosetAIFix
The AI's core no longer fits inside regular closets
2016-02-26 08:37:57 -06:00
tkdrg
ee42b2d051 Merge pull request #15652 from lordpidey/wallbuildfix
Fixes inability to construct walls with shuttlemetal
2016-02-25 15:29:58 -03:00
KazeEspada
8aeb2678e0 You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts. 2016-02-24 23:15:19 -07:00
phil235
3ea7cf9831 The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag).
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
2016-02-24 22:56:54 +01:00
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