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
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
PKPenguin321
b0dafff3c8
fixes conflicts, removes sec implementation from security.dm
2016-04-21 15:55:12 -07:00
Lularian
9022073221
belts changes
2016-04-21 04:54:44 -05: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
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
c0
c9926867d1
Final Solution for one shitty meme
2016-04-19 11:02:56 +03: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
842d50cef2
Merge pull request #16831 from zenek123/master
...
Makes vodka able to clean floors
2016-04-18 02:06:54 -05: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
Joan Lung
a88f498701
Merge pull request #16918 from coiax/drone-duffles
...
Drones start with preloaded engineering dufflebags
2016-04-17 15:49:57 -04:00
coiax
884d85e519
Adjusted dufflebag contents
2016-04-17 20:21:23 +01:00
Joan Lung
6c16bc874a
Merge pull request #16843 from PKPenguin321/krow-macaw
...
Adds Krav Maga
2016-04-17 00:02:48 -04:00
PKPenguin321
ac3e7e18dd
final style changes
2016-04-16 20:30:18 -07:00
Jack Edge
db5f08adf0
Fixed indentation issues
2016-04-16 18:29:44 +01:00
Jack Edge
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
Joan Lung
262c0688de
Merge pull request #16845 from Shadowlight213/Bluemag
...
Adds bluespace emag as a badmin item
2016-04-15 20:26:02 -04:00
PKPenguin321
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
PKPenguin321
ea3fea4d63
fixes dna injector bug
2016-04-14 12:45:05 -07:00
Cheridan
2f52e7daf9
Merge pull request #16829 from erwgd/LetUsMakeDinnerware
...
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
Cheridan
95b41dfaee
Merge pull request #16851 from coiax/helpimonfire
...
Using fire extinguisher in help intent is helpful
2016-04-14 11:47:17 -05:00
Joan Lung
d8a724f1c4
Merge pull request #16806 from coiax/airlock-painter
...
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
Jack Edge
54675eb415
Only call get lungs once
2016-04-14 08:27:59 +01:00
Cheridan
7eb6ed727e
Merge pull request #16838 from Shadowlight213/implantlogging
...
Explosive implant logging and general improvements.
2016-04-13 18:11:30 -05:00
Jack Edge
6aa77cc95d
Removed unneeded seperation
2016-04-13 22:13:02 +01:00
Jack Edge
51b41fc124
Use correct variable names and correct proc calls
2016-04-13 22:09:26 +01:00
nullbear
df32979866
Adds Chemical Explosives
...
see changelog for details
2016-04-13 13:09:41 -07:00
Jack Edge
64f5f1a08e
Removed check preventing self target extinguisher
...
The comment on this code segment implies it's to stop the fire
extinguisher from going off when put in a bag. Except it doesn't go
off when put in a bag, even without this code check.
As such, it was stopping self targeting with a fire extinguisher.
Make sure the safety is off though!
2016-04-13 18:17:00 +01:00
Jack Edge
cafd76c7f2
Handled case where someone lost their lungs
...
We won't remove your lungs if you don't have any. But how did you
manage to lose them in this tiny window, you horrible person?
2016-04-13 11:33:25 +01:00
Jack Edge
01a3d0e761
Added help to extinguisher/attack but bugged
...
It's not triggering the afterattack proc to spray the water...
2016-04-13 11:25:11 +01:00
Shadowlight213
5ebf9be9ab
Grammar
2016-04-12 21:02:49 -07:00
Shadowlight213
24770414cc
desc change
2016-04-12 20:01:31 -07:00
Shadowlight213
0364d1850b
Adds bluespace emag
...
Removes depreciated clown data card.
2016-04-12 19:45:18 -07:00
PKPenguin321
c86e390caf
adds krav maga
2016-04-12 18:30:14 -07:00
Shadowlight213
d2e2e3f6d3
Made explosive implants actually log who triggered them
...
Removed some copy pasta
Made explosive implants not drop brains
2016-04-12 15:26:53 -07:00
KorPhaeron
4c8ea85b59
Merge pull request #16810 from Shadowlight213/giftsprite
...
Fixes gift sprite
2016-04-12 17:19:49 -05:00
