Commit Graph

5142 Commits

Author SHA1 Message Date
Fox-McCloud
427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Markolie
eb84caaa90 Fix vending machine coin issue/runtime 2015-08-12 22:27:29 +02:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Krausus
bfc3961350 Rips out unnecessary relaymove call on set machines
Also removes a sanity check that is no longer necessary.
2015-08-11 22:40:37 -04:00
FalseIncarnate
133b1233f9 Assorted Fixes and Returns Accidentally Removed Features
Fixes mutant plants not properly inheriting preset icons

Fixes preset icons incorrectly having a color overlay applied
- This was most noticeable on berries, as the color overlay would render
most of the icon black or red, instead of the intended multi-color icon

Returns emote capabilities to diona nymphs
- Accidentally removed by #1171

Returns Moonflowers, Novaflowers, Ghost Peppers, and Koi Beans
- Accidentally removed by #980
- Sunflowers can mutate into Moonflowers or Novaflowers
- Novaflowers contain pure welding fuel
- Moonflowers contain plantmatter and moonshine
- Chili peppers can mutate into Ghost Peppers or Ice Peppers
- Ghost Peppers contain plantmatter, capsaicin, and condensed capsaicin
- Soybeans can mutate into Koi Beans
- Koi Beans contain plantmatter and carpotoxin

Returns Hydroponics Harvests tracking for End-of-Round score
- Accidentally removed by #980

Updated the descriptions for plants to account for moonshine, welder
fuel, and carpotoxin
- This is to maintain consistency with other reagent-based descriptions
for the plants
2015-08-11 03:05:43 -04:00
Fox-McCloud
d2d3dad6d6 Merge pull request #1687 from TheDZD/wiznerd2
Lightning Bolt Buff
2015-08-10 19:34:40 -04:00
Fox-McCloud
ad2888f634 Merge pull request #1695 from Markolie/mapfix
Fix West Mining Outpost SMES
2015-08-10 17:29:14 -04:00
TheDZD
28623b44fb Merge pull request #1680 from Fox-McCloud/brain-eating
Removes Brain Eating
2015-08-10 14:41:27 -04:00
Markolie
a088ffd1b8 Ghost fix revert 2015-08-10 05:21:04 +02:00
Fox-McCloud
deafc93baa Dismemberment Tweaks 2015-08-09 22:11:37 -04:00
DZD
93df90d09f Lightning Bolt Buff
- Now always bounces 5 times (for a total of 6 hits).
- Now always does at least 15 damage per hit, with a maximum of 50.
- Now affects people wearing insulated gloves, tough luck if they're wearing an fully insulated chest-covering armor though.
2015-08-09 18:58:53 -04:00
Markolie
a01d9e100c Make sure ghosts always use their correct icon/overlays rather than the generic white spooky scary ghost 2015-08-10 00:17:32 +02:00
Markolie
cfe4fd4d88 Fix slime feeding exploit 2015-08-09 20:08:57 +02:00
Markolie
3c32dbd626 Vampire UI refresh fix 2015-08-09 19:07:41 +02:00
Markolie
27b8adc426 Fix compile error 2015-08-09 18:38:46 +02:00
Markolie
b471406faa Vampire bats no longer attack their owner, fixes hostiles not attacking spacepods 2015-08-09 18:22:24 +02:00
Markolie
a522d0a86f Enable ventcrawling for slimes 2015-08-09 18:14:19 +02:00
Markolie
bddfb7029d Make sure special_role is assigned in pre_setup 2015-08-09 18:12:14 +02:00
Fox-McCloud
094a6f7196 Removes Brain Eating 2015-08-08 23:21:12 -04:00
Fox-McCloud
541c662296 Merge pull request #1540 from Krausus/ProcessSchedulerTweaks
Process and Process Scheduler Tweaks
2015-08-08 20:46:23 -04:00
DZD
16bdb00351 Nukes useless /wizard/ spell pathing
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
2015-08-08 14:06:50 -04:00
Fox-McCloud
5ce0ae0516 Fixes Movement Speed Modifiers 2015-08-08 04:15:41 -04:00
TheDZD
171c0d2d6c Merge pull request #1387 from Aurorablade/STILLALOTOFBLOOD
[Need Feedback] TG Slaughter Demon Port Remake, THE REGIBBINGING
2015-08-07 18:19:38 -04:00
Aurorablade
bec3b6bf6e Typo and color macro fix 2015-08-06 23:57:34 -04:00
TheDZD
70fc864ce8 Merge pull request #1651 from Fox-McCloud/shadowling-surgery-and-fixes
Shadowling Surgery and Fixes
2015-08-06 19:21:38 -04:00
Fox-McCloud
395646edbe Merge pull request #1653 from Markolie/alarms
Runtime/bug fixes
2015-08-06 16:40:18 -04:00
Mark van Alphen
fd9ca9102c Runtime fixes 2015-08-06 18:40:00 +02:00
Aurorablade
95565847b7 Changes
Revert to the orignal TG method of just shoving a player into the daemon
on vial break.

did the same for the event (i still like using the revenant spawns
rather then carp spawns for that, not as disoriniting to me)

Added reference to BLOODCRAWL_EAT i missed

Devouring now heals more types of damage

Removes some gore abilitys...I got overzealous in wanting
blood....Keeping the spooky demon head whisper...
No don't ask why i called it Pustle...My brain frightens me...
2015-08-06 01:56:59 -04:00
Fox-McCloud
5ae43f0875 Shadowling Surgery and Fixes 2015-08-05 21:52:17 -04:00
Fox-McCloud
050e111157 Merge pull request #1603 from TheDZD/shadowling
Shadowling Updates
2015-08-05 20:26:25 -04:00
DZD
7637fe9582 Finalizes Changes
- Adds action buttons for Shadowling spells
- Fixes bugs and runtimes found while testing.
- Remove stupid snowflake check that allowed mobs with environment_smash
>= 2 to smash reinforced walls, but not regular walls (what the actual
fuck?).
2015-08-05 18:22:01 -04:00
Fox-McCloud
27388d4763 Vulpkanin Tail Fix 2015-08-04 17:57:11 -04:00
Krausus
60fed2cf71 Resolves further merge conflicts 2015-08-03 23:40:28 -04:00
Mark van Alphen
8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	code/__HELPERS/lists.dm
2015-08-03 23:59:45 +02:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
Fox-McCloud
080b1b30db Merge pull request #1612 from Markolie/appearancechanger
Ports Bay's appearance changer
2015-08-03 17:30:58 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
a2f8141036 NanoUI power monitor/AI subsystem, mapfix 2015-08-03 03:38:38 +02:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
2015-08-03 00:04:24 +02:00
Fox-McCloud
7d806cbd12 Merge pull request #1602 from Markolie/powernet
Powernet rework
2015-08-02 17:26:37 -04:00
Markolie
be9ea0b540 Alarm system tweaks 2015-08-02 19:20:37 +02:00
Markolie
4360b5a867 Remove debug proc 2015-08-02 07:14:12 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Tigercat2000
809c34eeb2 Fix xeno icons getting stuck due to impossible check 2015-08-01 20:27:10 -07:00
Markolie
e35431da34 Port Bay's appearance changer 2015-08-01 23:22:20 +02:00
Markolie
aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
2015-08-01 21:44:47 +02:00
Markolie
dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
Fox-McCloud
10ceb14432 Merge pull request #1608 from TheDZD/mining2
Diamond Drill and Drone Fixes
2015-08-01 13:13:02 -04:00
DZD
ba82f03d7c Drill and drone fixes
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
Markolie
70ed700e24 Make sure mask is selected 2015-08-01 01:56:17 +02:00