Commit Graph

6511 Commits

Author SHA1 Message Date
FlattestGuitar
bda736fb7c Merge branch 'master' into PAIN 2017-06-27 21:18:17 +02:00
tigercat2000
fb83d58607 Merge pull request #7436 from Alexshreds/emp
Radio EMP
2017-06-27 12:02:03 -07: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
tigercat2000
4de7b36268 Merge pull request #7582 from Kyep/dust_implant_fix
Fixes dust implants
2017-06-23 23:31:15 -07:00
Crazy Lemon
a66a31ee83 Merge pull request #7589 from Vivalas/master
Fixes weird offset with beds when buckled.
2017-06-23 09:26:39 -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
Vivalas
84e3ce1b9a Integrates offset better 2017-06-20 17:30:42 -05:00
Sam
89b48eaad3 Stops RCD from placing infinite airlocks on a single tile 2017-06-20 03:42:21 +01:00
Vivalas
88f32290fc Fixes bed offset 2017-06-19 20:45:20 -05: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
Fox McCloud
0f485fa9df Merge pull request #7562 from SamHPurp/fixes-window-completion-step
Stops multi-windoor creation
2017-06-16 19:55:51 -04:00
Sam
d343c6c8cf Fixes implied src's 2017-06-16 22:03:09 +01:00
Fox McCloud
a3de63e1c8 Merge pull request #7362 from TullyBurnalot/AutopsyReportProdigyChild
Adds Coroner Report Printer
2017-06-16 16:35:25 -04:00
Fox McCloud
06b4719961 Merge pull request #7529 from Aurorablade/ChaplainClothes
More Chaplain Clothes
2017-06-16 16:10:32 -04:00
Sam
9df64aadd5 Stops multi-windoor creation 2017-06-15 12:21:43 +01:00
Sam
804692d988 Adds a random option for flashes 2017-06-15 02:20:27 +01:00
Sam
e3bf6e3562 Adds random option for cable cuffs too 2017-06-15 01:47:28 +01:00
Sam
911cf31635 Adds a random crayon option for map makers 2017-06-15 01:39:29 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Sam
1f84807adb dasvidaniya \the 2017-06-14 09:50:47 +01:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Sam
fc1d4a9cb9 Adds cooldown to stop the spam, also uses the right gender pronoun 2017-06-14 06:15:32 +01:00
Aurorablade
ef227542e0 typofix 2017-06-11 21:03:21 -04:00
Aurorablade
dd22ea0415 missed icons 2017-06-10 22:53:13 -04:00
Sam
e94880ad67 Fixes conflict 2017-06-10 10:18:05 +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
Fox McCloud
b982080f16 Merge pull request #7258 from KasparoVy/cloning-crating-and-closeting
Fixes Some RCS Issues
2017-06-09 19:23:42 -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
Fox McCloud
9acf29f808 Merge pull request #7506 from FlattestGuitar/nice-gloves-whered-you-get-these
Adds forensics gloves
2017-06-09 17:44:19 -04:00
Fox McCloud
9a774cee7a Merge pull request #7415 from Kyep/glowshroom_wirecutter
Wirecutters destroy glowshrooms
2017-06-09 15:13:55 -04:00
FlattestGuitar
61dd2707ac Merge branch 'master' into PAIN 2017-06-09 14:44:31 +02:00
KasparoVy
fc93a1f4a6 Amends RCS Sanity 2017-06-08 19:58:27 -04:00
KasparoVy
c39d963a25 Fixes #7242, RCS Exploit
You can no longer teleport crates/closets by dialog-stacking if you're
not adjacent to them and if the RCS doesn't have enough charge.
2017-06-08 19:58:27 -04:00
FlattestGuitar
362b19f7bf Adds forensics gloves 2017-06-08 21:21:23 +02:00
tigercat2000
3652c3001a ViewMods - Allows custom view ranges.
The primary function of this is a new button in the "Preferences" tab -
Set View Range. This functions similarly to the admin verb "Change View
Range", but it only allows you to set view ranges lower than the normal
world.view.

Full changelog:
 - Added ViewMods system to clients.
   - Everything that wants to change client.view should do it through
   this system.
   - Currently used by the Set View Range button and Marauders.
   - Stretch mode is set to stretch when active, but the original
   setting is preserved, as long as you set it with no ViewMods enabled.
   - The basic way this works is that it keeps track of /datum/viewmods
   on /clients, and whenever one is added or removed, it picks the
   highest view range out of all of them and sets the client's vision to
   that. This effectively means that, if you, say, set your view range
   to 5x5, and get into a Marauder and use the "zoom" button, it will
   always go to the marauder's zoom level.
   - The HUD is set to minimal mode for any view ranges below
   world.view, which means you only get absolutely critical buttons.
   	- It's set to invisible if you go down to view range 1 or 2,
	because the buttons can't fit on the screen at those view
	ranges.
 - Removed canvas examine option. Just zoom in yourself!
2017-06-07 19:39:33 -07: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
Aurorablade
ec3af5684d Its late 2017-06-04 03:53:23 -04:00