Commit Graph

2613 Commits

Author SHA1 Message Date
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
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
FlattestGuitar
92eb5d458a typos 2017-06-03 20:08:27 +02: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
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
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
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
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
Tigercat2000
bbca8405ef -tg- Move Refactor
This commit ports /tg/'s move refactor.

The throwing system has been replaced entirely, removing the necessity
of throw_at_fast and resolving multiple outstanding issues, such as
crossbows being unusable.

Spacedrifting has also been upgraded to function with the new throwing
system. It is now it's own process.

Tickcomp has been killed, and the config values have been adjusted to
more or less match live Paradise.

All mobs now share a common Bump() proc. There are only four mobtypes
which do not, including humans and simple animals. With the exception
of mob types that do not ever want to Bump() or be Bumped(), they should
call the parent proc.

Human movement slowdown has been moderately tweaked in how it stacks effects;
It shouldn't be significantly different from a player perspective.

Mobs will now spread fire if they bump into another mob. I don't want to set
the world on fiiiire, I just want start a flame in your heart~

For player facing changes: Input delay has been reduced by roughly ~50ms for
any direction keys, by advantage of a previously unknown flag on byond verbs
which allow them to operate independently from the tick rate of the server.
You may need to clear your interface.dmf file if you have a custom skin for
this change to function.
2017-05-25 06:35:01 -07:00
Tayyyyyyy
3fa66c7f60 Use species check instead of hair check to prevent tendril shaving
This reverts commit 0de4b320fa.
2017-05-23 11:09:19 -07:00
Tayyyyyyy
fa2c643124 Remove extra "this" 2017-05-23 00:29:30 -07:00
Tayyyyyyy
0de4b320fa Prevent Skrell tentacles from being shaved 2017-05-22 01:59:55 -07:00
FlattestGuitar
96b2242aee fixes welder runtime 2017-05-18 12:01:24 +02:00
Fox McCloud
146e3a6540 Merge pull request #7305 from FlattestGuitar/brigerino-kekerino
Adds radios and prisoner IDs to prisoner lockers
2017-05-16 06:47:44 -04:00
Fox McCloud
195a907ffe Merge pull request #7123 from SamHPurp/Fixes
Fixes
2017-05-15 19:21:01 -04:00
FlattestGuitar
fa4f4246ed Adds radios and prisoner IDs to prisoner lockers 2017-05-13 23:40:19 +02:00
Fox-McCloud
bbd306d60f fix 2017-05-13 07:23:56 -04:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Sam
9e30dfbdf7 Holy whip now references the station 2017-05-07 09:10:59 +01:00
Fox McCloud
12c4b2933c Hydro and Bees GC fixes (#7221)
* Hydro and Bees GC fixes

* more shit
2017-05-06 15:01:36 -07:00
Alffd
a662a48794 Don't step on glass (#7223) 2017-05-06 14:58:32 -07:00
Fox McCloud
9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Crazylemon64
528e359296 Refactors heart attacks, unbreaks incremental cloning 2017-05-01 05:35:45 -07:00
Fox McCloud
36d4298e2b Merge pull request #7198 from Crazylemon64/organ_varname_refactor
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-30 17:00:44 -04:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
scrubmcnoob
329fba9f14 Requested Changes
All the changes requested.
2017-04-29 21:58:27 -04:00
scrubmcnoob
20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -04:00
Crazy Lemon
67f72b2791 Merge pull request #7109 from Lady-Luck/syndibundles
Syndicate Bundle Adjustments
2017-04-21 09:25:38 -07:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Sam
88252397c2 Spelling/Grammar fixes in the occult 2017-04-18 20:06:35 +01:00
Krausus
4572ad6af4 Fixes matchboxes lacking storage limitations 2017-04-16 22:53:03 -04:00
Lady-Luck
b9274b6654 Reverts removal of the uplink implant to the implant bundle, instead just removes EMP and Microbomb. 2017-04-16 14:57:31 -05:00
Lady-Luck
e767fdab8a Changes the two red energy swords into a red double-bladed energy sword (reverted from commit 46d4c5b9c7) 2017-04-15 17:05:22 -05:00
Lady-Luck
46d4c5b9c7 Changes the two red energy swords into a red double-bladed energy sword 2017-04-15 16:19:01 -05:00
Lady-Luck
0d1179a54a Adjusts syndicate bundles, adds Allies Cocktail object for bond bundle 2017-04-15 16:01:09 -05:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Fox McCloud
e9156ef71b Merge pull request #7036 from FlattestGuitar/desolate-fluff
Adds a fluff item for DesolateG 👌
2017-04-11 19:52:14 -04:00