Commit Graph

4711 Commits

Author SHA1 Message Date
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
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
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
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 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 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
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
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
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
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
bawhoppen 44f18a8296 belt changes 2016-04-22 07:34:27 -05:00
bawhoppen dfc91ae3c9 phix 2016-04-22 06:15:12 -05:00
Jordie 03067837fa Merge pull request #16976 from nullbear/grenade-tweaks
tiny fixes to my stuff. (Sorry! >~<)
2016-04-22 20:29:53 +10:00
nullbear a7c9c80977 tiny fixes to little things
allows deconstruction of xenobio computer again.

renames chem grenades to chem grenades.

makes advanced grenades scale up their unit thing.

makes chemical payload scale up with matter bin used in construction,
and more accessible in general
2016-04-22 03:20:47 -07:00
TechnoAlchemist fe7582a10c no more krav maga probably 2016-04-21 18:17:40 -07:00
PKPenguin321 b0dafff3c8 fixes conflicts, removes sec implementation from security.dm 2016-04-21 15:55:12 -07:00
TechnoAlchemist 7b79508b17 bone ore and path REFACTOR. 2016-04-21 15:36:27 -07:00
Lularian c01d739390 R&D is shit 2016-04-21 17:27:47 -05:00
TechnoAlchemist e61fba82ea Adds Bones and sinew to butchering results. Adds bone armor. 2016-04-21 12:58:15 -07:00
Lularian 9022073221 belts changes 2016-04-21 04:54:44 -05:00
oranges f5d28527c5 Properly revert the container drop code 2016-04-21 20:33:16 +12:00
Cheridan 6f1ba9a669 Merge pull request #17008 from ChangelingRain/shivertile
Floor tiles have slightly random placement
2016-04-20 22:42:11 -05:00
Shadowlight213 d0670ad141 Removes brains dropping from admin caused gibs and c4 suicide 2016-04-20 20:12:38 -07:00
Cheridan fb02af044a Merge pull request #16995 from ChangelingRain/thisiswhathappenswhenyoumergewithoutanyonecheckingmyworkkor
Fixes cyborg screwdriver and wirecutters having no icon
2016-04-20 18:03:30 -05:00
Cheridan ec001cf1d9 Merge pull request #16952 from Core0verload/meme-out
i was the antiskub all along
2016-04-20 17:56:59 -05:00
Cheridan c53887e4c1 Merge pull request #16987 from ChangelingRain/overlay
Makes a few things use temporary overlays
2016-04-20 12:11:58 -05:00