Commit Graph

1241 Commits

Author SHA1 Message Date
Ergovisavi 8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
Joan Lung 03293aa18d CLEVER BAIT 2016-09-06 19:28:03 -04:00
Joan Lung b3909e6f3e Adds another unused ashplanet turf 2016-09-06 17:51:24 -04:00
Cheridan 25637d3521 Merge pull request #20346 from ChangelingRain/pleasecomebackiknowicantoffermuchthebodiesicangiveyouareweakthestoriesitellareimpossiblemyworldisevenmoreprecariousthanthisonebutpleasecomeback
SIZABLE FOWL tweaks and fixes
2016-09-06 15:54:55 -05:00
Cheridan db9dde5aec Merge pull request #20307 from ChangelingRain/icantevencomesaveyoubuticanpromiseonethingthereisroomforthreeinmyworldandonlytwoinhis
The lava staff now has a delay before creating lava
2016-09-06 15:38:15 -05:00
Cheridan 5531d1d430 Merge pull request #20351 from KorPhaeron/nerflavaland
Mining nerf
2016-09-06 15:36:20 -05:00
Joan Lung b208e41add Watchers are now actually flying and will not fall into chasms (#20344) 2016-09-06 13:46:56 +02:00
Jordie c74b6fc170 improves ORM location report (#20318) 2016-09-05 19:56:56 -05:00
KorPhaeron adb89ae2b1 Lavaland Nerf 2016-09-05 19:37:17 -05:00
Joan Lung 2db6c344a6 proppa 2016-09-05 15:41:35 -04:00
Joan Lung 84e67f3554 SIZABLE FOWL tweaks and fixes 2016-09-05 15:37:03 -04:00
Joan Lung a1a526d1c3 Do I get off on conflicting with myself or something 2016-09-05 08:12:55 -04:00
Joan Lung 7711fba9bd The Hierophant (#19921)
* HIEROPHANT

* whoops

* that'd be hilarious but unwise

* BIRD_SCORE

* density

* BIRD THREAT

* maybe a threat tm

* danger boss

* it's always the paren

* bird murder

* recall

* no message

* yelling bird

* time
time
come on, time
time
shades

* A ruin!

* I think five blasts is enough

* birdboss wants you dead

* giant boss arena

* hierophant no longer literally unfightable

* smaller ruin?

* no longer innate

* can toggle friendly fire, teleport is AoE

* comments!

* just fucking spawn the arena wew

* heal on resetting

* not as common

* I cannot be trusted

* eeeh

* !

* keep it off the station

* as common as sin

* stop cheesing the boss you asshole

* this looks better

* that ruin didn't even exist what the fuck

* wew

* rip

* it doesn't need full healing if it heals for half when it resets

* good for fighting mobs

* rune where you are

* mechanics; armor doesn't fucking matter rip you

* armor matters but not much so

* )

* meaner than hell and more likely to kill you

* remove those beasts from my beautiful square house

* fix

* you should be able to tell what it's doing, even if you can't actually react to it
being totally unable to tell what the fuck just killed you is bad design, you should know how you died even if you couldn't do shit
rip 3x3 chaser

* start higher scale to the same

* the ruin that doesn't exist and costs 10 points to place

* now what's all this commented out stuff hmmmmmmmmmmm
what could it possibly be

* accurate

* tracking

* boring unused lore

* it needs to be open, oranges. open.

* I did that specifically to note which commit it was on ree

* oh there's a proc for that. duh.

* logging is good

* horrifying

* the marginal kindness of a giant bird boss

* ruin tweak

* idiot bird

* adjust
2016-09-05 10:05:35 +12:00
Joan Lung 78da15f5f6 lovely defines 2016-09-03 17:55:02 -04:00
oranges 240a6f2823 Merge pull request #20267 from ChangelingRain/justanothersteppingstonetothenextgreatmaniacrushofdesignjustanotherstoneinthevoid
Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer
2016-09-04 09:45:59 +12:00
Joan Lung bb64a42835 The lava staff now has a delay before creating lava 2016-09-03 15:55:27 -04:00
GunHog 0575213666 Tweaks Aux Base Stat Logging
Aux Mining Base stat logging actually works now, and includes the
coordinates where the base lands.
2016-09-02 14:36:28 -05:00
Remie Richards 00738bd2a3 More than 2 hands!? WHAAAAAAT 2016-09-02 16:10:16 +01:00
Joan Lung a6b3f3dc6e Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer 2016-09-01 18:45:36 -04:00
kevinz000 29779ed0ee chestproofing 2016-08-29 19:12:57 -07:00
kevinz000 a6af5eadb4 Revert "lavaproofing"
This reverts commit e528b65915.
2016-08-29 19:12:24 -07:00
kevinz000 e528b65915 lavaproofing 2016-08-29 19:01:36 -07:00
Joan Lung 073eed4009 a classic 2016-08-28 21:33:27 -04:00
Joan Lung 566936355a less loops 2016-08-28 21:28:35 -04:00
Joan Lung 58459e6239 fix issue 2016-08-28 21:13:08 -04:00
Joan Lung 9ea303705a fancy 2016-08-28 09:14:22 -04:00
Joan Lung bfb6fa9c16 Makes lavaland more atmospheric 2016-08-27 23:55:33 -04:00
oranges 251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes
More Mining Base Tweaks
2016-08-28 12:38:12 +12:00
oranges ced523874c Merge pull request #20099 from ChangelingRain/ayesgivenlikeitsallsomeonecansaylikeitstheonlyoptionisjustasbadasgoingonwhentheysayno
The staff of lava can now turn lava back into basalt
2016-08-28 12:37:14 +12:00
Incoming5643 424d450dbc Makes the "nothing happened!" option of drake's blood vaguely more entertaining/frustrating (#20144)
* Makes the "nothing happened!" option of drake's blood vaguely more entertaining by turning those who hit it into a lizardperson approximating the appearance of an ash drake.

* changed the colors to a suggestion of @ChangelingRain
2016-08-27 16:55:59 -05:00
Joan Lung 325991092b The staff of lava can now turn lava back into basalt 2016-08-25 09:42:41 -04:00
GunHog 42e052af64 More Mining Base Tweaks
- The remote now no longer has its own dimension settings, it depends
entirely on the map now
- Fixed the mining shuttle turning its docking point into LAVA
2016-08-25 08:24:17 -05:00
Cheridan 5defa30696 Merge pull request #20062 from ChangelingRain/takepainstohurtnobodywhereyoucanwhereyourmerepresenceisapainleavewhereyourwordsaredaggerscloseyourmouthwhereyoursightisarakinglashcloseyoureyes
Adds several KA mods and allows mining borgs to install any KA mods
2016-08-24 13:26:54 -05:00
Joan Lung 8bf7011ab6 Using a resonator on an existing resonator field will immediately detonate that field (#20001)
* Using a resonator on an existing resonator field will immediately detonate that field

* field updates

* late night code

* buff
2016-08-24 16:08:28 +12:00
Cheridan c68ef5909d Merge pull request #20045 from TechnoAlchemisto/dads_coma_was_the_best_thing_to_ever_happen_to_this_family
Places mining scanners above mining satchels in miner lockers. Also minor sprite changes
2016-08-23 23:02:01 -05:00
NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
2016-08-23 17:08:36 -07:00
Joan Lung d955dacefd hit modkits 2016-08-23 15:51:38 -04:00
Joan Lung 54c1d0ef35 MODS MODS MODS GET EM NOW 2016-08-23 15:26:19 -04:00
Joan Lung 7355d91718 Adds a damage AoE KA mod 2016-08-23 10:37:20 -04:00
GunHog d8f31dbb55 Aux Mining Base Tweaks (#20015)
* Aux Mining Base Tweaks

- Multiple landing zones may now be set for the mining base.
- The coordinates of each landing zone is shown in the list.
- Miners now each get a remote in their starting lockers.
- The Aux mining base now requires lighting while on station
- The Aux Mining Base now has a GPS signal.

* More tweaks

- The shuttle landing beacon no longer requires line of sight, just a
distance check.
- Beacon now has a description.
- Landing site name updated
- Adds support for stat logging base drops.

* Mining Shuttle Interface

- The aux base can now interface with the mining shuttle once the
shuttle beacon is deployed near the base.
- Updated descriptions to explain this.

* Launch Warning

Keeps the launch warning without it going off each time it is used to
move the mining shuttle.
2016-08-23 17:25:01 +12:00
Joan Lung 844ed6786b Merge pull request #20007 from Ergovisavi/power_of_the_power_of_the
Replaces the fireball book in the Drake chest with a book of Sacred Flame
2016-08-22 21:02:51 -04:00
Ergovisavi 642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
TechnoAlchemist 77811d5b92 Places mining scanners above mining satchels. 2016-08-22 15:26:59 -07:00
NikNakFlak b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
Cheridan 84522e7573 Merge pull request #19955 from KorPhaeron/auxbasefix
Fixes aux base breaking to space
2016-08-20 23:25:59 -05:00
KorPhaeron eb39ca8e6e Kinetic Accelerator Mods (#19942)
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
2016-08-19 21:04:25 +12:00
Ergovisavi f163c9e525 Changes to the fulton pack (#19944)
* Consolidated the fulton packs into one pack
* Allows you to fulton yourself by directly attaching it to yourself
* Consolidated the mining voucher fulton kits into one kit
2016-08-18 23:07:33 -05:00
KorPhaeron 4bbfa163dd Aux Base Fix 2016-08-18 16:02:37 -05:00
WJohn b1dc6cd5b7 Adds aux mining base. (#19892)
* First part of fixes and nondescript shit who even reads these

* all done
2016-08-18 12:54:58 +12:00
Ergovisavi 8656d3e7eb Adds "Proto-Kinetic Crusher", a melee mining weapon (#19891)
* Mining Hammer

* Adds the mining hammer "Proto-Kinetic Crusher" item
Makes megafauna a little easier to hit in melee
Makes jaunters and Hivelord cores fit in the mining belt

* Fixing a file that should have been untouched
Other miner (geddit) fixes for the mining hammer
2016-08-17 14:29:16 +02:00