627c600b81
Restore CLF3 to standard level
...
Whoops. Forgot to reintegrate a fire_stacks multiplication when I
reintegrated mob fire.
2015-04-29 17:17:34 -07:00
43a09daddc
Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent
...
Conflicts:
code/modules/reagents/reagent_containers/glass_containers.dm
maps/cyberiad.dmm
Fawwkss wai ;-;
2015-04-29 15:31:21 -07:00
c1826deeda
Various Fixes
2015-04-29 18:12:24 -04:00
38ab273dda
Fix up reagent bombs, remove carbon fire_act
...
Carbon mobs do not actually need a fire_act, all it was doing was breaking
things with hardsuits. Reagent bombs are supposed to have a unique proc
instead of fire_act, so fixed.
2015-04-29 14:42:57 -07:00
57cd8f69c7
Fixes Colorful Reagent coloring non-simple mobs
2015-04-29 07:52:56 -04:00
fc9607d17b
Fixes Portable Chem Dispenser recharge delay
...
Now calculates properly, and matches up with the recently-reduced
recharge delay of the full-size dispensers
2015-04-29 07:38:26 -04:00
6e0bfbbbfa
Merge remote-tracking branch 'upstream/master' into okayletstrysomethingslightlydifferent
...
Conflicts:
maps/cyberiad.dmm
2015-04-28 14:26:43 -07:00
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
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
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
837538ce95
Reverts a Few Chem Changes
2015-04-27 17:41:13 -04:00
f620fab569
[Goonchem] Fixes
2015-04-27 13:50:50 -04:00
50cabacb29
Merge pull request #886 from veganzombeh/vampire
...
Prevents vampires getting fat by drinking too much blood.
2015-04-27 11:08:02 -04:00
100789f6ec
Merge pull request #877 from Fox-McCloud/beakerbomb
...
[Goonchem] Beaker Bombs
2015-04-26 10:07:46 -04:00
cf1ac2f602
Fixes #881 and lets vampires gain nutrition from consuming blood reagent.
...
Fixes #881 , vampires should no longer get fat from drinking too much blood. Handle_blood now checks for blood that isn't their own and "eats" it.
2015-04-26 11:33:05 +01:00
fb579b0d19
assembly fixes
2015-04-25 22:43:40 -04:00
2ea39812e7
Merge pull request #847 from TheDZD/420yolotest
...
Removes Changeling Bloodtest
2015-04-25 17:48:53 -04:00
013e7cfcdd
Merge pull request #874 from Fox-McCloud/chem-messages
...
[Goonchem] No Mix Messages
2015-04-25 17:45:31 -04:00
71b4e9e719
Merge pull request #871 from Fox-McCloud/goregib
...
More Gore from Gibbing
2015-04-25 15:28:49 -04:00
3f1726fbb8
Merge pull request #867 from Fox-McCloud/smoke
...
[Goonchem] Smoke Tweaks
2015-04-25 15:28:40 -04:00
9b205e5be9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
2015-04-25 13:46:41 -04:00
c226067277
[Goonchem] Beaker Bombs
2015-04-25 05:28:56 -04:00
bd16e0fbaa
[Goonchem] No Mix Messages
2015-04-24 16:21:33 -04:00
32e868621f
More Gore from Gibbing
2015-04-24 08:01:07 -04:00
9a99f8758f
[Goonchem] Smoke Tweaks
2015-04-24 00:17:03 -04:00
773f093f2b
Spider Balance--Venom
2015-04-22 18:36:38 -04:00
dd27b54f15
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
2015-04-22 11:51:18 -04:00
2d93888ea0
Vampires get nutrition from blood, not food.
...
Sucking blood increases nutrition, nutriment reagent does not. Also adds an immunity check for holy water contact.
2015-04-22 10:19:16 +01:00
8de0140dcc
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/setup.dm
2015-04-21 18:56:34 -04:00
e8038738f6
Merge pull request #800 from ZomgPonies/shadow
...
Mutantrace update
2015-04-21 18:36:24 -04:00
5a51494ca6
Merge pull request #850 from Fox-McCloud/tators
...
Traitor Item Additions and Surplus Crates
2015-04-21 17:31:34 -04:00
1adc73a45c
Merge pull request #838 from Fox-McCloud/donkpockets
...
Donk Pocket Fix
2015-04-21 08:06:54 -04:00
9885688934
Traitor Item Additions and Surplus Crates
2015-04-21 03:05:12 -04:00
dcfdee5a59
Removes changeling bloodtest
2015-04-20 21:28:59 -04:00
b4bb5cccee
DERP
2015-04-20 16:46:30 -04:00
6374add892
Merge pull request #835 from Fox-McCloud/mixmixmix
...
[Goonchem] Custom Mix Sounds and Animated Dispenser
2015-04-20 08:23:16 -04:00
bd63d505a0
Donk Pocket Fix
2015-04-19 15:19:26 -04:00
fcbe8dacf1
[Goonchem] Custom Mix Sounds and Animated Dispenser
2015-04-19 02:59:50 -04:00
4889bd56a0
[Goonchem] Minor Pyrotechnic Tweaks
2015-04-18 19:30:12 -04:00
7c688663cb
Merge pull request #828 from Fox-McCloud/decals
...
[Goonchem] Reagent Decals
2015-04-18 07:29:50 -04:00
a3589d10a4
Merge pull request #823 from tigercat2000/morearts
...
New martial arts style- Drunk Brawling
2015-04-18 07:20:29 -04:00
46f5acf01c
black powder spam
2015-04-18 01:32:09 -04:00
df94ccb855
fix for infinite explosions
2015-04-17 23:07:22 -04:00
33233941d5
[Goonchem] Reagent Decals
2015-04-17 18:27:49 -04:00
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
98af2982c8
Merge pull request #820 from tigercat2000/Spraycans
...
Adds spraycans, fixes lipstick, modifies scleaner
2015-04-16 16:39:19 -04:00
88e8a67a86
Merge pull request #822 from tigercat2000/globalblocklist
...
Move hostile blacklist to global variable
2015-04-16 16:38:40 -04:00
7a863e53ab
Merge pull request #816 from CrAzYPiLoT-SS13/master
...
Hydro fix & colorful corgis
2015-04-16 16:37:47 -04:00
e6d7a6f67b
Merge pull request #801 from Fox-McCloud/vending
...
[Goonchem] New Vending Machines
2015-04-16 16:37:32 -04:00
9ffdadb252
Move hostile blacklist to global variable
...
This moves the multiple lists of blacklisted hostile mobs
(as in, unsafe or intended for special use) into a single global
variable. This means that gold slime cores and dimensional tears
now use the same list of mobs, for simplicity.
2015-04-16 09:30:36 -07:00
Tigercat2000