Commit Graph

438 Commits

Author SHA1 Message Date
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
duncathan salt
227b3149b2 Merge pull request #14441 from SouDescolado/master
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
Cheridan
d16fe1c490 Merge pull request #14419 from KorPhaeron/chasm_fix
Chasm Fix
2016-01-06 13:30:17 -06:00
SouDescolado
4a7cb6a066 Fixes abandoned crates minigame
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.

Remove useless variable
2016-01-06 10:43:54 -02:00
KorPhaeron
936973a68d Chasm Fix 2016-01-05 13:54:12 -06:00
Nerd Lord
4815a0f37c Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
duncathan salt
c510fb69c2 Merge pull request #14337 from AnturK/miningbot
Fixes mining bot being hard to repair.
2016-01-04 20:23:23 +01:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
AnturK
41f7d95aa4 Fixes mining bot being hard to repair.
Stops bruisepacks working on mining bot
2016-01-03 13:18:02 +01:00
Aranclanos
29977a2d16 Merge pull request #14243 from KorPhaeron/darkness
Fixes floor is lava and advanced darkness
2016-01-03 02:54:21 -03:00
KorPhaeron
28a0c48403 Moves spawn to weather 2016-01-02 23:21:46 -06:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
KorPhaeron
dde4690cb4 Fixes floor is lava and advanced darkness 2016-01-01 05:43:17 -06:00
tkdrg
e5941a59a2 Merge pull request #14124 from KorPhaeron/darkness
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
KorPhaeron
b9bf6ef547 Advanced Darkness 2015-12-31 19:32:02 -06:00
KorPhaeron
ff5767d785 Nevermind 2015-12-30 20:12:40 -06:00
KorPhaeron
9499d35c6b Diety name 2015-12-30 19:39:35 -06:00
KorPhaeron
79e5f3d37e Check that actually works 2015-12-30 19:10:49 -06:00
KorPhaeron
e0157185fc Blacklist 2015-12-30 10:10:54 -06:00
KorPhaeron
9148b9ccd2 Bluespace shelter 2015-12-29 13:08:29 -06:00
KorPhaeron
9cf6a315b7 Advanced Darkness 2015-12-28 15:25:42 -06:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
KorPhaeron
15d4ad156c Final (I hope) weather tweaks 2015-12-24 23:03:32 -06:00
KorPhaeron
4d7d3654bc False alarm fix 2015-12-24 05:05:13 -06:00
KorPhaeron
6716fc9282 Entirely area based 2015-12-24 03:50:27 -06:00
KorPhaeron
1b7892a37e Lavaland Turfs 2015-12-23 06:33:22 -06:00
KorPhaeron
07bdfef551 Opacity Fix 2015-12-23 05:02:48 -06:00
KorPhaeron
404666546b More weather updates 2015-12-23 04:45:09 -06:00
KorPhaeron
ef30f9e64d Less copypaste 2015-12-22 10:29:27 -06:00
KorPhaeron
772451816d Code clean up 2015-12-22 10:18:06 -06:00
KorPhaeron
70060cb6c1 Weather datums 2015-12-22 05:31:46 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
MMMiracles
55ebaf3bdb snow stuff i guess 2015-12-15 17:33:34 -05:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
bgobandit
01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00
KorPhaeron
755455c9de New sprite 2015-12-10 01:36:27 -06:00
KorPhaeron
8f01581fc0 Updates to use variables 2015-12-07 18:28:36 -06:00
KorPhaeron
c9330c5ef0 Chasm 2015-12-05 02:35:33 -06:00
KorPhaeron
b8909aa814 Fixes the pre-mapped cave pieces to spawn the right tiles 2015-12-03 16:07:00 -06:00
KorPhaeron
0e4078fb90 Mine turf fixes 2015-12-03 14:25:38 -06:00
KorPhaeron
2600371fe0 Updates mine turfs to be slightly more modular 2015-11-28 18:49:40 -06:00
KorPhaeron
99df1d798d New mining turfs 2015-11-27 22:10:07 -06:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
bgobandit
2fd13edef2 Adds hivelord stabilizer. Fixes a bug. 2015-11-18 22:04:01 -05:00
bgobandit
b928b8ec18 fixes memestation, ups ore points slightly 2015-11-18 19:51:49 -05:00
bgobandit
bb397fcc0d fixes bluespace crystal related bug 2015-11-18 19:32:20 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00