Commit Graph

2661 Commits

Author SHA1 Message Date
Fox-McCloud
42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Crazy Lemon
eab996d107 Merge pull request #7678 from Fox-McCloud/misc-fixes
Icon Fixes
2017-07-04 13:01:23 -07:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
tigercat2000
fef7abc867 Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000
c2b3b1adaa Merge pull request #7682 from Fox-McCloud/radio-jammer
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
Crazy Lemon
c69a8c4f70 Merge pull request #7677 from Aurorablade/TeleportFix
Hand Tele bug fix
2017-07-03 14:08:43 -07:00
Fox-McCloud
0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
Fox-McCloud
04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Fox-McCloud
8e9eae8341 other "radios" 2017-07-01 00:14:36 -04:00
Fox-McCloud
426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00
Aurorablade
70b1a0c826 bugfix 2017-06-30 03:16:12 -04:00
Fox-McCloud
5bc6e36756 helpers 2017-06-29 20:14:29 -04:00
Fox-McCloud
b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud
585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
tigercat2000
2c935a9a31 Merge pull request #6940 from Citinited/pipe-dreams-travis-woo
Adds the Rapid Pipe Dispenser (RPD)
2017-06-27 13:32:59 -07:00
FlattestGuitar
bda736fb7c Merge branch 'master' into PAIN 2017-06-27 21:18:17 +02:00
tigercat2000
13a862be02 Merge pull request #7556 from SamHPurp/couple-more-random-variants
Adds random colours on cable cuffs & crayons, and the ability for flashes to start burnt out
2017-06-27 11:41:27 -07:00
tigercat2000
46dcfe3190 Merge pull request #7619 from SamHPurp/buff-barbers
QOL improvement for antag barbers
2017-06-27 11:27:40 -07:00
Fox McCloud
30c59c3bd2 Merge pull request #7204 from Crazylemon64/tk_refactor
Tk refactor+Remote tool use
2017-06-26 16:55:04 -04:00
Citinited
8931a06936 Crazylemon changes 2017-06-24 08:08:55 +01:00
tigercat2000
4de7b36268 Merge pull request #7582 from Kyep/dust_implant_fix
Fixes dust implants
2017-06-23 23:31:15 -07:00
Sam
b69835e0e5 buffs scissors 2017-06-23 09:36:53 +01:00
Crazylemon64
72841c9e70 Refactors TK to work a bit more consistently
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07:00
Crazy Lemon
13bceae762 Merge pull request #7590 from SamHPurp/RCD-multiple-airlocks
Fixes RCDs placing multiple airlocks on a single tile
2017-06-22 17:47:42 -07:00
Sam
89b48eaad3 Stops RCD from placing infinite airlocks on a single tile 2017-06-20 03:42:21 +01:00
Fox McCloud
3e065e730e Merge pull request #7554 from SamHPurp/more-qdel-nulls
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
Kyep
7adf320ff1 Fixes dust implants 2017-06-18 22:28:20 -07:00
Sam
e3bf6e3562 Adds random option for cable cuffs too 2017-06-15 01:47:28 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Sam
7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam
7cf499dcc1 Adds movement intents 2017-06-10 10:12:14 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Fox McCloud
2c38612b76 Merge pull request #7494 from FalseIncarnate/swords-yea-swords
Adds Highlander Style: The Martial Art of Highlanders
2017-06-09 23:57:17 -04:00
FalseIncarnate
c2ad198203 can_use_guns -> no_guns 2017-06-09 21:39:50 -04:00
tigercat2000
c6560ef23e Merge pull request #7501 from Fox-McCloud/illegal-implants
Replaces Illegal R&D Gear with Other Implants
2017-06-09 14:49:38 -07:00
Citinited
6bff5d59f7 Minor tweaks 2017-06-09 16:14:50 +01:00
FlattestGuitar
61dd2707ac Merge branch 'master' into PAIN 2017-06-09 14:44:31 +02:00
Fox-McCloud
72557e1c88 Replaces Illegal R&D Gear with Other Implants 2017-06-07 21:27:25 -04:00
FalseIncarnate
81030c717c Destroy() 2017-06-07 15:11:37 -04:00
tigercat2000
b419782526 Luxury Bluespace Capsule & More
tgstation/tgstation#27881

There is now a second bluespace shelter capsule, which is much more
fancy & expensive. Note, this still does not make them generally available.

Changes Summary:
 - Added "Shelter Beta" - It comes with a built in kitchen, toilet, shower, three
 course meal, and an artifact™️! There are plenty of secrets to
 behold..
 - Added black carpeting. This can be created by the personal crafting
 menu and having any crayon + a carpet with you.
 - Added fancy wooden and fancy black wooden tables. These are craftable
 by hitting wooden table parts with regular and black carpet,
 respectively.
 - You can now unanchor, deconstruct and color shower curtains. Use any kind of
 crayon to color them, and screwdriver to unanchor them. Once they are
 unanchored, you may use wirecutters to change them back into materials-
 All of which are used in a new crafting recipe for creating them.
 - Display cases moderately refactored.
 - Added survival pod windows/windoors for the new luxury pod.
2017-06-07 11:17:44 -07:00
tigercat2000
6573daf8d5 Merge pull request #7440 from Aurorablade/Cutouts
Ports Cardboard cutouts
2017-06-07 11:13:04 -07:00
FalseIncarnate
9e88e7f1db Adds Highlander Style: The Martial Art of Highlanders
Adds a new martial art: Highlander Style!
- Wielders of the powerful Highlander claymores are imbued with this
mythical prowress. Should your both your hands ever lack a grip on a
Highlander claymore, you will relinquish your newfound skill.
- Highlander Style grants immunity to ranged attacks and an unwavering
distain of cowardly guns. Just like with Sleeping Carp, you will deflect
projectiles and cannot fire guns (but can pick them up to throw in the
trash where they belong).

Adds new weapon: Highlander Claymore
- Grants the wielder the Highlander Style while held in either hand.
- Normal claymores were left in, but do not provide the martial art (so
they are "safe" to use outside highlander)

Minor refactor to martial arts which prevent use of guns.
- No longer relies on the name of the style, but rather the new
aptly-named var: `can_use_guns`

🆑
rscadd: Adds Highlander Style, granted to the wielder of Highlander
Claymores. This martial art allows you to deflect ranged attacks from
the weapons of COWARDS. FOR THE HONOR OF THE HIGHLANDERS!
tweak: Highlander now equips combatants with a Highlander claymore
instead of a normal claymore. FIGHT ON BROTHERS!
/🆑
2017-06-07 02:35:23 -04:00
Citinited
d94306768d Some more tweaks 2017-06-07 01:12:00 +01:00
Fox-McCloud
f4409825c3 last fixes 2017-06-06 00:10:59 -04:00
Fox-McCloud
3de897d884 more tweaks 2017-06-05 17:32:29 -04:00
Fox-McCloud
673f18f3e7 tweaks 2017-06-05 17:14:04 -04:00
Aurorablade
ec3af5684d Its late 2017-06-04 03:53:23 -04:00