Commit Graph

1050 Commits

Author SHA1 Message Date
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
9b7b4ae656 Apply most/all of LINDA's updates
This commit ports most, if not all of LINDA's updates on -tg-, and fixes a
few bugs that appear to be unique to paradise's codebase.
2015-04-28 12:45:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
ZomgPonies
8ce0212850 Final fixes 2015-04-21 18:05:43 -04:00
Fox-McCloud
9885688934 Traitor Item Additions and Surplus Crates 2015-04-21 03:05:12 -04:00
ZomgPonies
a3589d10a4 Merge pull request #823 from tigercat2000/morearts
New martial arts style- Drunk Brawling
2015-04-18 07:20:29 -04:00
Tigercat2000
190fbcbd20 Updates the drunk-brawling fighting style
This commit updates drunk-brawling martial art style to follow
Fox-P-McCloud's suggestion of it being set to Paralyse() instead of
SetSleeping().
2015-04-17 03:16:01 -07:00
Tigercat2000
1f69a5ecaa Adds a new martial arts style- Drunk Brawling
This adds a new martial arts datum, labeled as Drunken Brawling. This
style is automatically added and removed to people via ethanol,
specifically, 10 life ticks after they start slurring their words.

The style is mostly debuffs, as there is a flat 50% chance to miss any
harm-intent hit, a 70% chance to fail to grab, and disarm is unaffected.

The actual 'features' of this style can be summarized as such:
 - Custom attack verbs
   - "jab","uppercut","overhand punch",
   "drunken right hook","drunken left hook"
   - Uppercut has a 5% chance to do 14 damage

 - Limit's combat abilities
   - 70% chance to fail to passively grab
   - 50% chance to miss any harm intent
   - Disarm intent is untouched.

 - Added by ethanol when someone has had it into their system
   for a while
   - Removed as soon as the ethanol becomes lower than 3 units
2015-04-16 14:43:26 -07:00
ZomgPonies
ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -04:00
DZD
ed1f2cc04c Martial Arts port from /tg/
- Ports tgstation/-tg-station#8810 and tgstation/-tg-station#8942
- Puts copypasta grab code in alien_defenses.dm and human_attackhand.dm
files into a single proc in living_defense.dm, grabbedby.
2015-04-14 17:59:13 -04:00
ZomgPonies
55dbbc32b5 Might as well update golems also 2015-04-13 06:05:42 -04:00
Fox-McCloud
421c27b4e4 chainsaw fixups 2015-04-12 07:44:11 -04:00
Fox-McCloud
286a1ad5df [Goonchem] Food Reagents 2015-04-10 04:46:50 -04:00
Fox-McCloud
b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00
Fox-McCloud
e1db537443 [Goonchem] Poison Traitor Bottles 2015-04-05 23:37:41 -04:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
SamCroswell
98fd743f6d Adds Poster Supply Packs 2015-04-03 17:15:07 -04:00
Tigercat2000
f837edf180 Spaceworm overhaul 2015-04-01 03:13:48 +02:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Tigercat2000
18072a8539 Replace other instances of item/blueprint 2015-03-26 18:55:31 +01:00
Fox-McCloud
abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
Fox-McCloud
29ab8700e9 adjustments 2015-03-25 23:30:47 -04:00
Fox-McCloud
cedb71e8af Clarity 2015-03-22 20:18:01 -04:00
Fox-McCloud
d9a257c890 Teleporter Gun, Fixes, and Tweaks 2015-03-22 02:45:02 -04:00
Fox-McCloud
9fef88f347 Implant Cleanup 2015-03-17 06:30:54 -04:00
ZomgPonies
c693be1c57 Merge pull request #548 from tigercat2000/SlimeColorChanger
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
Tigercat2000
b3c5963e3e Fix weirdness with datacore rendering HAS_SKIN_COLOR races as default
color
2015-03-11 17:24:04 +01:00
Tigercat2000
7da4efc494 Fix proc/update_preview_icon as well as ID images for colored slime people 2015-03-11 16:18:34 +01:00
FalseIncarnate
e4a5190188 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-08 20:29:07 -04:00
Fox-McCloud
89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
FalseIncarnate
ae13c938c5 Kitchen Overhaul
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.

Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard

Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds

Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.

Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.

This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Fox-McCloud
7e542873fe Fixes 2015-03-06 01:13:03 -05:00
ZomgPonies
bc900d678a Merge pull request #512 from Markolie/master
Fix player panel, other fixes
2015-03-04 10:23:36 -05:00
Markolie
6352d2abd9 Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix 2015-03-04 15:09:12 +01:00
ZomgPonies
463204c913 Merge pull request #493 from Markolie/master
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
Markolie
1db034a8f8 NanoUI synth airlock update 2015-03-03 18:45:22 +01:00
Markolie
1deef3104e NanoUI synth airlock controller 2015-03-03 04:51:32 +01:00
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
ZomgPonies
7799470ca5 Merge pull request #460 from Markolie/master
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
2015-03-01 12:30:15 -05:00
Fox-McCloud
a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
Markolie
3be7fb33e3 Remove duplicate antag obj 2015-02-28 18:15:22 +01:00
Fox-McCloud
62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00