Commit Graph

7503 Commits

Author SHA1 Message Date
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
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
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
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
bawhoppen 44f18a8296 belt changes 2016-04-22 07:34:27 -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
TechnoAlchemist e61fba82ea Adds Bones and sinew to butchering results. Adds bone armor. 2016-04-21 12:58:15 -07:00
Nerd Lord 3079539182 text 2016-04-21 14:53:52 -04:00
Nerd Lord fb87a435d1 Aliens and monkeys can now climb structures 2016-04-21 08:59:47 -04:00
Lularian 9022073221 belts changes 2016-04-21 04:54:44 -05:00
Cheridan 4df060ccc2 Merge pull request #16700 from Bawhoppen/smallspawnerchanges
Removes salt-shaker from maint loot
2016-04-21 00:28:06 -05:00
c0 417902badc Replaces fake Insulated Gloves with cheap Insulated Gloves in maint drop 2016-04-21 08:06:42 +03: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
Nerd Lord 50c63428e4 t&a 2016-04-20 16:38:55 -04: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 7b89890bd7 EMP range is no longer capped 2016-04-20 11:40:01 -04: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
KorPhaeron 6c91bc15d3 Merge pull request #16943 from ChangelingRain/colorfulcarp
Charger holocarp will now color the trail properly
2016-04-18 18:36:20 -05:00
Cheridan aa48717c29 Merge pull request #16972 from ChangelingRain/cratefailure
You can actually place items in crates now
2016-04-18 18:34:17 -05:00
PKPenguin321 5aadc0494a fixes conflicts 2016-04-18 16:30:16 -07:00
Nerd Lord 9bd1d57061 You can actually place items in crates now 2016-04-18 19:21:02 -04: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