Commit Graph

859 Commits

Author SHA1 Message Date
Joan Lung
01af00225b Miners can buy KA AoE damage mods from the vendor for a premium (#20430)
* Miners can buy AoE damage mods from the vendor for a premium

* message adjustment; if you don't have ENOUGH who cares if you COULD

* adjusta
2016-09-17 16:25:35 +12:00
Cheridan
2a0168abdb Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Moves all beam icon states to beams.dmi
2016-09-13 11:55:24 -05:00
Joan Lung
0067bd1332 Adds brass, used to construct various brass objects (#20419)
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
2016-09-13 12:16:28 +02:00
Joan Lung
179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
phil235
443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Joan Lung
5592d46594 touch lightly 2016-09-12 09:05:19 -04:00
Remie Richards
8dd507995a Fixes conflicts, dang it people if(src != user.l_hand && src != user.r_hand) is shit code, shiiiiiiiiiiit. 2016-09-10 20:42:34 +01:00
Remie Richards
c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung
fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Cheridan
e281d9f416 Merge pull request #20411 from ChangelingRain/ibendthedefinitionoffaithtoexoneratemyblindeyetilthesirenssoundimsafe
Adds Ash Plants
2016-09-10 11:56:10 -05:00
Joan Lung
e1c7d0d574 you missssed oooone 2016-09-10 09:29:14 -04:00
Joan Lung
5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016
New colossus loot, the "Anomalous Crystal"
2016-09-08 22:38:50 -04:00
Ergovisavi
114676c548 Finishing up anomalous crystals 2016-09-08 19:29:49 -07:00
Joan Lung
097c05ff2c no message 2016-09-08 22:03:26 -04:00
Joan Lung
8533cb12ed Adds Ash Plants 2016-09-08 21:58:59 -04:00
Cheridan
f79e2de334 Merge pull request #20372 from ChangelingRain/ohbutdeartheskyislowwatchfluentseamenrigtheirrudderssotheyllgrazeitwiththeirwindarrows
Adds another unused ashplanet turf
2016-09-08 15:02:26 -05:00
Joan Lung
7f200976ec no message 2016-09-07 08:35:28 -04:00
Ergovisavi
4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
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