12d5a910b5
Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
...
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
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
18e1c7825d
bigger
2016-04-25 19:40:51 -07:00
04eac2cbe6
adds explorer belt.
2016-04-25 15:59:02 -07:00
ad9eec737f
Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
...
Refactors dog clothing
2016-04-25 11:46:44 -04:00
121564f927
Merge pull request #17027 from optimumtact/patch-1
...
Properly revert the container drop code
2016-04-25 00:58:28 -05:00
d32bfc4dc1
Merge pull request #17041 from Bawhoppen/boh
...
Lets BoH hold mech parts
2016-04-25 00:53:53 -05:00
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
43e98079f1
Removing some comments I had left in.
2016-04-24 21:12:04 +02:00
0480790b0a
Same things but with structures now.
2016-04-24 20:38:33 +02:00
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
1927fc73e6
Dog fashion on the back
2016-04-24 14:40:08 +01:00
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
18ce641950
Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA
2016-04-23 15:14:09 -05:00
d7ec2c2e97
Merge pull request #16993 from Robustin/dblememes
...
Double-Esword Blockrate Fix
2016-04-23 14:29:41 -05:00
77f7995b45
Update twohanded.dm
2016-04-23 15:23:00 -04:00
3e3001acb2
Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA
2016-04-22 12:21:14 -05:00
fe24d5fbbc
Merge pull request #17029 from Bawhoppen/beltchanges
...
A few belt changes
2016-04-22 09:43:45 -04:00
cc93f90585
woops forgot something
2016-04-22 07:35:52 -05:00
44f18a8296
belt changes
2016-04-22 07:34:27 -05:00
dfc91ae3c9
phix
2016-04-22 06:15:12 -05:00
03067837fa
Merge pull request #16976 from nullbear/grenade-tweaks
...
tiny fixes to my stuff. (Sorry! >~<)
2016-04-22 20:29:53 +10:00
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
b0dafff3c8
fixes conflicts, removes sec implementation from security.dm
2016-04-21 15:55:12 -07:00
c01d739390
R&D is shit
2016-04-21 17:27:47 -05:00
9022073221
belts changes
2016-04-21 04:54:44 -05:00
f5d28527c5
Properly revert the container drop code
2016-04-21 20:33:16 +12:00
d0670ad141
Removes brains dropping from admin caused gibs and c4 suicide
2016-04-20 20:12:38 -07:00
fb02af044a
Merge pull request #16995 from ChangelingRain/thisiswhathappenswhenyoumergewithoutanyonecheckingmyworkkor
...
Fixes cyborg screwdriver and wirecutters having no icon
2016-04-20 18:03:30 -05:00
fb274886f9
regardless of what you do this is disgusting
2016-04-19 15:44:30 -04:00
fd243de33d
kor's fault
2016-04-19 15:40:02 -04:00
12a7c871fb
DblEsword block buff
2016-04-19 15:17:44 -04:00
c9926867d1
Final Solution for one shitty meme
2016-04-19 11:02:56 +03:00
3527347160
Shock Revolver
2016-04-18 21:29:43 -05:00
5aadc0494a
fixes conflicts
2016-04-18 16:30:16 -07:00
a5600abd26
Use drone dufflebag sprites
2016-04-19 00:03:24 +01:00
c06c81a3a6
fuck sprite conflicts
2016-04-18 16:30:07 -04:00
bab446dcd2
New tool inhand sprites
2016-04-18 16:15:23 -04:00
d671bf573c
Merge pull request #16858 from nullbear/Chemical-Explosives
...
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
842d50cef2
Merge pull request #16831 from zenek123/master
...
Makes vodka able to clean floors
2016-04-18 02:06:54 -05:00
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
a88f498701
Merge pull request #16918 from coiax/drone-duffles
...
Drones start with preloaded engineering dufflebags
2016-04-17 15:49:57 -04:00
884d85e519
Adjusted dufflebag contents
2016-04-17 20:21:23 +01:00
6c16bc874a
Merge pull request #16843 from PKPenguin321/krow-macaw
...
Adds Krav Maga
2016-04-17 00:02:48 -04:00
ac3e7e18dd
final style changes
2016-04-16 20:30:18 -07:00
db5f08adf0
Fixed indentation issues
2016-04-16 18:29:44 +01:00
683aa9b26f
Drones start with preloaded engineering dufflebags
...
🆑 coiax
rscadd: Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's
/🆑
2016-04-16 18:09:28 +01:00
262c0688de
Merge pull request #16845 from Shadowlight213/Bluemag
...
Adds bluespace emag as a badmin item
2016-04-15 20:26:02 -04:00
2ecb556e94
addresses minor feedback, fixes implant
...
krav maga implant now works 100%
trailing returns and a useless if() removed
2016-04-14 22:49:29 -07:00
ea3fea4d63
fixes dna injector bug
2016-04-14 12:45:05 -07:00
KorPhaeron
phil235
TechnoAlchemist
Joan Lung
phil235
Jack Edge
KorPhaeron
Robustin
bawhoppen
Jordie
nullbear
PKPenguin321
Lularian
oranges
Shadowlight213
Cheridan
c0