Commit Graph

4693 Commits

Author SHA1 Message Date
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
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
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
Nerd Lord 30c5fc412c Floor tiles have slightly random placement 2016-04-19 23:28:49 -04:00
Nerd Lord fb274886f9 regardless of what you do this is disgusting 2016-04-19 15:44:30 -04:00
Nerd Lord fd243de33d kor's fault 2016-04-19 15:40:02 -04:00
Robustin 12a7c871fb DblEsword block buff 2016-04-19 15:17:44 -04:00
duncathan salt b85e10f00a Merge pull request #16929 from kevinz000/safegriefing
Admin Detection Multitool
2016-04-19 08:52:36 -06:00
Nerd Lord ff44a04f3b Makes a few things use the temporary overlays instead of doing stuff manually 2016-04-19 10:28:40 -04:00
c0 c9926867d1 Final Solution for one shitty meme 2016-04-19 11:02:56 +03:00
kevinz000 e446c5b411 Definesarenice 2016-04-18 23:40:30 -07:00
KorPhaeron 3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
PKPenguin321 5aadc0494a fixes conflicts 2016-04-18 16:30:16 -07:00
Jack Edge a5600abd26 Use drone dufflebag sprites 2016-04-19 00:03:24 +01:00
Nerd Lord c06c81a3a6 fuck sprite conflicts 2016-04-18 16:30:07 -04:00
Nerd Lord bab446dcd2 New tool inhand sprites 2016-04-18 16:15:23 -04:00
Cheridan d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
Cheridan e7f7704099 Merge pull request #16921 from RandomMarine/theclothening
Biogenerated cloth stacks.
2016-04-18 02:27:36 -05:00
Cheridan 842d50cef2 Merge pull request #16831 from zenek123/master
Makes vodka able to clean floors
2016-04-18 02:06:54 -05:00
kevinz000 6bd271b299 Itried 2016-04-17 20:26:55 -07:00
PKPenguin321 7501ddebf9 krav update
1. actually adds icons that i forgot to commit to actions.dmi
2. makes leg sweep only do weaken(2) in krav_maga.dm, also adds a /sec subtype of krav maga gloves with a more obvious name
3. makes sec start with the /sec gloves in security.dm
4. makes the krav maga implant a toggle instead of giving you krav maga and deleting itself in implant_krav_maga.dm
5. adds my self to admins.txt
2016-04-17 20:15:42 -07:00