Commit Graph

7540 Commits

Author SHA1 Message Date
phil235 fb93f88fca Fixes weird shit happening when clickdragging things from your inventory into a closet to stuff it in. You can now only stuff mobs and items into closet, and you cannot stuff things that are inside something (mostly your inventory). 2016-04-28 01:45:44 +02:00
KorPhaeron cf08028eb0 Merge pull request #17046 from PKPenguin321/krav-sec-warden
Gives krav maga gloves to the warden
2016-04-27 16:09:04 -05:00
Razharas efa60f8587 Fixes BoHs
Fixes BoHs
fix https://github.com/tgstation/-tg-station/issues/17173
2016-04-27 21:33:36 +03:00
Razharas 88b55ced87 Fixes chameleon projector explosion protection (#17138)
Fixes chameleon projector explosion protection
2016-04-27 17:31:54 +02:00
Razharas c396cd5be5 Fixes falsewalls being unsmashable (#17135)
* Fixes falsewalls being unsmashable
2016-04-27 17:29:56 +02:00
Joan Lung a5fffec3a4 Merge pull request #17137 from Razharas/BoHinBoHFix
Fixes drone or any other boh in boh abuse
2016-04-27 08:45:31 -04:00
KorPhaeron 12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
PKPenguin321 1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
kevinz000 de5a214132 Fixes detection multitool (#17011)
* detectionfix

* unnessacary_things_removal

* Uranges
2016-04-26 19:49:11 +02:00
erwgd 02b29f888a Prevents collapsing roller beds or grabbing chairs whilst incapacitated (#17074)
* added if(usr.incapacitated) for grabbing a chair

* added if(usr.incapacitated()) for collapsing a roller bed
2016-04-26 19:41:21 +02:00
Razharas 534d970567 Fixes drone or any other boh in boh abuse
Fixes drone or any other boh in boh abuse
2016-04-26 15:34:49 +03:00
duncathan salt 0f0aa25976 fixes watcher sinew origin tech 2016-04-25 23:44:06 -06:00
KorPhaeron 5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00
TechnoAlchemist 18e1c7825d bigger 2016-04-25 19:40:51 -07:00
TechnoAlchemist 04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
phil235 bb1f60e769 Fixes typos and errors I made.
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
KorPhaeron 3934b7ae3d Merge pull request #17078 from ChangelingRain/opensesame
Hitting a closet with an item will try to open it
2016-04-25 01:00:50 -05:00
KorPhaeron 121564f927 Merge pull request #17027 from optimumtact/patch-1
Properly revert the container drop code
2016-04-25 00:58:28 -05:00
KorPhaeron d32bfc4dc1 Merge pull request #17041 from Bawhoppen/boh
Lets BoH hold mech parts
2016-04-25 00:53:53 -05:00
TechnoAlchemist 556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist 581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
Cheridan 7448863152 Merge pull request #17067 from coiax/light-fun
Buffs light replacer and makes it easier to use
2016-04-24 19:32:22 -05:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235 639ff5d161 Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP. 2016-04-24 20:39:30 +02:00
phil235 0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge 1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge 2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00
Jack Edge 6bc4fbf700 More changes 2016-04-24 13:23:33 +01:00
Jack Edge 0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
Jack Edge e4203c7ce9 Dogs can wear certain items that are not clothing
RIP. It's going to be a long PR.
2016-04-24 09:47:10 +01:00
Joan Lung 9894342f50 Merge pull request #17017 from Shadowlight213/Admingib
Removes brains dropping from admin caused gibs and c4 suicide
2016-04-23 22:14:36 -04:00
Nerd Lord 6a3f1c843a frankly, too fast 2016-04-23 21:55:15 -04:00
Nerd Lord 9fdfd4a49e Hitting a closet with an item will try to open it 2016-04-23 21:53:11 -04:00
KorPhaeron 18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
KorPhaeron d7ec2c2e97 Merge pull request #16993 from Robustin/dblememes
Double-Esword Blockrate Fix
2016-04-23 14:29:41 -05:00
Robustin 77f7995b45 Update twohanded.dm 2016-04-23 15:23:00 -04:00
Jack Edge d80130b6a7 Removed comments 2016-04-23 17:41:12 +01:00
Jack Edge 1329b004f2 Removes trailing return 2016-04-23 17:28:20 +01:00
KorPhaeron 3c8a3b08db Merge pull request #17021 from Core0verload/gluves
Replaces fake insulated gloves with cheap insulated gloves in maint drop
2016-04-23 10:44:52 -05:00
Jack Edge c420fd167a Buffs light replacer and makes easier to use
🆑 coiax
rscadd: The Janitor's Union has mandated additional features to station
light replacer devices.
rscadd: The light replacer now can be used on the floor to replace
the bulbs of any lights on that tile.
rscadd: The light replacer now eats replaced bulbs, and after a certain
number of bulb fragments (four) will recycle them into a new bulb.
tweak: The description of the light replacer is now more informative.
/🆑
2016-04-23 15:08:52 +01:00
Cheridan beb6b506d5 Merge pull request #17030 from ChangelingRain/alienclimb
Aliens and monkeys can now climb structures
2016-04-23 00:29:50 -05:00
Razharas c69a342ca5 Merge pull request #17014 from ChangelingRain/ayymp
EMP range is no longer capped
2016-04-23 02:28:46 +03:00
KorPhaeron 0099ea2d93 Merge pull request #17036 from TechnoAlchemisto/goliathbones
Adds Bones and sinew to butchering results. Adds bone armor(craftable)
2016-04-22 18:08:51 -05:00
KorPhaeron 3e3001acb2 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-22 12:21:14 -05:00
Joan Lung fe24d5fbbc Merge pull request #17029 from Bawhoppen/beltchanges
A few belt changes
2016-04-22 09:43:45 -04:00
bawhoppen cc93f90585 woops forgot something 2016-04-22 07:35:52 -05:00