Commit Graph

6471 Commits

Author SHA1 Message Date
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
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
Aurorablade
4d775a70a5 syndiekit update 2017-06-04 02:48:34 -04:00
Aurorablade
3b5e6e4ff5 fixes 2017-06-03 22:01:00 -04:00
FlattestGuitar
92eb5d458a typos 2017-06-03 20:08:27 +02:00
Sam
c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
Aurorablade
2b85c80464 well they COULD be demons... 2017-06-03 01:03:02 -04:00
Aurorablade
4df3e02190 adds a terrror spider. 2017-06-02 23:27:55 -04:00
Aurorablade
69e373bbfa ops need this. 2017-06-01 22:18:05 -04:00
Aurorablade
72c874fd50 What deathsquad? 2017-06-01 21:32:07 -04:00
Fox McCloud
3922f5957f Merge pull request #7379 from tigercat2000/science_refactor
RnD autolathe removal + tech level overhaul
2017-06-01 21:16:26 -04:00
Aurorablade
cf0db6792f tochat fix 2017-06-01 20:59:00 -04:00
Aurorablade
952f6ffd0b itsucanny 2017-06-01 20:02:44 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloud
19efd26f5b Merge pull request #7414 from SamHPurp/add-table-build-time
Adds a build-time table construction
2017-06-01 14:31:34 -04:00
Kyep
4efc4cc3a5 Updates to make sharp items effective more generally 2017-05-29 18:54:17 -07:00
Fox McCloud
6326115b61 Merge pull request #7405 from SamHPurp/SUPER-HIGH-PRIORITY-TWEAK-GAME-BREAKING-ARGHH
<span class='reallybig'>WHY ARE MEGAPHONES TINY ITEMS</span>
2017-05-29 16:30:33 -04:00
Fox McCloud
d9b409c0de Merge pull request #7399 from SamHPurp/shrinks-encryption-keys
Classes encryption keys as 'small' items
2017-05-29 16:30:21 -04:00
Kyep
b6311e4d4d Wirecutters destroy glowshrooms
Two hits with a wirecutter now destroy glowshrooms.
This makes it possible to remove glowshroom infestations more easily
without scythes.
2017-05-28 20:47:24 -07:00
Sam
84b8bf1159 racks too, what the hell 2017-05-29 03:23:35 +01:00
Sam
2352777bf8 nerfs IKEA 2017-05-29 02:59:26 +01:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
Sam
cc207e2e54 Enlarges megaphones 2017-05-27 22:54:13 +01:00
Sam
3bc135b825 Reverts Megaphone change
Will do in separate PR.
2017-05-27 22:11:51 +01:00
Sam
9943df05fd Fixes small issue 2017-05-27 20:07:39 +01:00
Fox McCloud
3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning
Cloning now puts you together bit by bit
2017-05-27 14:48:23 -04:00
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Sam
24eed4c740 Using the defines 2017-05-27 12:38:24 +01:00
Sam
d668cb7bf5 why are they bigger than the headsets they go in... 2017-05-26 22:05:08 +01:00
Sam
261dcefca7 a few qdel_null's 2017-05-26 17:49:42 +01:00
tigercat2000
f7ebd8d9a3 Merge pull request #7377 from Tayyyyyyy/skrell_hair
Skrell can hold stuff in their tentacles
2017-05-25 18:23:13 -07:00
Fox McCloud
57a07815f9 Merge pull request #7066 from tigercat2000/BumpRefactor
/tg/ Move refactor
2017-05-25 17:36:01 -04:00