Commit Graph

1496 Commits

Author SHA1 Message Date
Joan Lung
ce40d29ead Makes the pronoun helper proc names less horrifyingly long (#20780)
* why were these so LONG, what the fuck

* gosh

* pronoun agenda
the true agenda is killing coiax's squished lines
2016-10-10 12:28:25 +13:00
phil235
5f835bfc26 Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
Please refer to #20867 and #20870 for a easier view of the changes. Those two PRs show all meaningful changes (hopefully) and doesn't show the files changed with just 3 lines changed.

This PR does three things:

    It makes all children of /obj/ use the same damage system.
    Previously to make your new machine/structure be destroyable you needed to give it a var/health, and its own version of many damage related proc such as bullet_act(), take_damage(), attacked_by(), attack_animal(), attack_hulk(), ex_act(), etc... But now, all /obj/ use the same version of those procs at the /obj/ level in code/game/obj_defense.dm. All these obj share the same necessary vars: obj_integrity (health), max_integrity, integrity_failure (optional, below that health level failure happens), and the armor list var which was previously only for items, as well as the resistance_flags bitfield. When you want your new object to be destroyable, you only have to give it a value for those vars and maybe override one proc if you want a special behavior but that's it. This reorganization removes a lot of copypasta (most bullet_act() version for each obj were nearly identical). Two new elements are added to the armor list var: fire and acid armor values.
    How much damage an obj take depends on the armor value for each damage category. But some objects are INDESTRUCTIBLE and simply never take any damage no matter the type.
    The armor categories are:
    -melee(punches, item attacks, xeno/animal/hulk attacks, blob attacks, thrown weapons)
    -bullet
    -laser
    -energy (used by projectiles like ionrifle, taser, and also by EMPs)
    -bio (unused for this, only here because clothes use them when worn)
    -rad (same)
    -bomb (self-explanatory)
    -fire (for fire damage, not for heat damage though)
    -acid
    For machines and structures, when their health reaches zero the object is not just deleted but gets somewhat forcedeconstructed (the proc used is shared with the actual deconstruction system) which can drops things. To not frustrates players most of these objects drop most of the elements necessary to rebuild them (think window dropping shards). Machines drop a machine frame and all components for example (but the frame can then be itself smashed to pieces).
    For clothes, when they are damaged, they get a "damaged" overlay, which can also be seen when worn, similar to the "bloody" overlay.

    It refactors acid. See #20537.
    Some objects are ACID_PROOF and take no damage from acid, while others take varying amounts
    of damage depending on their acid armor value. Some objects are even UNACIDABLE, no acid effect can even land on them. Acid on objects can be washed off using water.

    It changes some aspect of damage from fires.
    All /obj/ can now take fire damage and be flammable, instead of just items. And instead of having just FLAMMABLE objs that become ON_FIRE as soon as some fire touch them (paper), we now have objects that are non flammable but do take damage from fire and become ashes if their health reaches zero (only for items). The damage taken varies depending on the obj's fire armor value and total health. There's also still obj and items that are FIRE_PROOF (although some might still be melted by lava if they're not LAVA_PROOF).
    When a mob is on fire, its clothes now take fire damage and can turn to ashes. Similarly, when a mob takes melee damages, its clothes gets damaged a bit and can turn to shreds. You can repair clothes with cloth that is produceable by botany's biogenerator.

    It also does many minor things:
        Clicking a structure/machine with an item on help intent never results in an attack (so you don't destroy a structure while trying to figure out which tool to use).
        I moved a lot of objects away from /obj/effect, it should only be used for visual effects, decals and stuff, not for things you can hit and destroy.
        I tweaked a bit how clothes shredding from bombs work.
        I made a machine or structure un/anchorable with the wrench, I don't remember which object...
        Since I changed the meaning of the FIRE_PROOF bitflag to actually mean fire immune, I'm buffing the slime extract that you apply on items to make them fire proof. well now they're really 100% fire proof!
        animals with environment_smash = 1 no longer one-hit destroy tables and stuff, we give them a decent obj_damage value so they can destroy most obj relatively fast depending on the animal.
        Probably a million things I forgot.

If you want to know how the damage system works all you need is the three obj vars "obj_integrity", "max_integrity", "integrity_failure", as well as the armor list var and the resistance_flags bitfield, and read the file obj_defense.dm
2016-10-10 11:14:59 +13:00
Joan Lung
b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
Cheridan
1e92582bdd Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall
Adds some pronoun helpers
2016-09-29 12:41:27 -05:00
phil235
2d2975f783 Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
2016-09-27 22:33:08 +02:00
Joan Lung
29b4c6a8ff like a furious buzzing bee, or some metaphor or something. 2016-09-26 16:50:49 -04:00
kevinz000
125209cfd4 stuffs (#20633) 2016-09-26 14:55:12 +13:00
Joan Lung
2817e260f6 Fixes the colossus firing twice at one location while doing spiral shots (#20639) 2016-09-24 19:54:53 +12:00
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
phil235
26120b01c5 Some requested adjustments 2016-09-15 19:03:24 +02:00
phil235
9124c65198 Adds some visual effects when ammo casings are fired and when projectiles hit things. 2016-09-14 02:57:47 +02: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
PKPenguin321
c839ff7d11 adds a dumb reference to arrows (#20466) 2016-09-13 15:39:39 +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
TechnoAlchemist
eec3391270 Allows for sabre renaming. (#20367)
* Allows for sabre renaming.

* That's not supposed to be there

* Applies unique_rename to all /weapons

* fixes my stupid asshole
2016-09-13 09:05:30 +12: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
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
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
yackemflam
d3aec95d82 Sniper rounds now blow off limbs (#20209)
* Update bullets.dm

* Forgot about the non brutal rounds

* Update bullets.dm
2016-08-30 08:12:08 -05:00
Joan Lung
52ba13fbdf Remove xenobio's free antag (#20081) 2016-08-26 14:12:29 +12:00
Shadowlight213
04e38f424a Fixes temp gun not starting with a pin (#20094) 2016-08-25 19:06:46 -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
80dab4b752 rely on humans 2016-08-23 15:53:17 -04: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
Cheridan
bf5b5bd380 Merge pull request #20030 from MrStonedOne/erroinchargeoflights
Removes unneeded lighting checks.
2016-08-23 10:35:44 -05:00
Joan Lung
7355d91718 Adds a damage AoE KA mod 2016-08-23 10:37:20 -04:00
Leo
4efe1d20b6 Adds an actual bow to the game (#19990)
* Initial bow commit

* Finishes bow.

* Adds a quiver and some other bow stuff

* Fix conflicts

* Dot dot

* Use false instead of !ready_to_fire

* Remove unecessary ifs.
2016-08-23 09:07:17 +12:00
MrStonedOne
83eca75951 Removes unneeded lighting checks. 2016-08-22 08:56:53 -07:00
Iamgoofball
5bc7fbd7f0 MCFLT 2016-08-19 12:12:59 -07:00
Iamgoofball
1818f3781c Fixes medigun description 2016-08-19 12:06:49 -07: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
Jordie
8d62df91c3 Readds irradiate failure to nuclear gun on EMP (#19915)
* readds irradiate failure to nuclear gun

* adds overlay proc and bases failure chance to 0
2016-08-18 21:13:12 -05:00
Incoming5643
85cc99dc02 Staff of Change 2016 (#19925)
* Staff of Change 2016 Mid year whitelist pull!

It's now possible to turn into a cogscarb in the robot table
It's now possible to turn into a watcher, goliath, headslug, morph, stick man, stick dog, or lesser dragon(!) in the hostile animal table

* you no longer get an achievement for killing the lesser ask drake
2016-08-17 19:30:54 -05:00
Cheridan
926b37a91d Merge pull request #19870 from KorPhaeron/ka_overhaul
Kinetic Accelerator Overhaul [WIP]
2016-08-16 12:26:10 -05:00
KorPhaeron
100275b85f Kinetic Accelerator Overhaul 2016-08-13 18:06:28 -05:00
Shadowlight213
02b39437e4 Adds the security temperature gun. 2016-08-10 22:48:53 -07:00
KorPhaeron
9ee67f942a Projectile Dismemberment and Wizard spellblade (#19783)
* Spellblade

* Plasma cutters and onback sprites

* Cleans up dismemberment projectile code

* Runtime fix
2016-08-11 15:43:29 +12:00
Joan Lung
bfb6dd5f94 The hyper-kinetic's explosion is now appropriately fast-looking (#19754)
* The hyper-kinetic explosion is now appropriately fast-looking

* close
2016-08-07 18:22:26 -05:00
Joan Lung
672577c956 Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677)
* Hyper-kinetics will no longer cause gibtonite to instantly explode

* how... likely is that
2016-08-05 17:51:12 -05:00
Razharas
248f45464b Merge pull request #19657 from ChangelingRain/itdbesaferitsalwayssafertojustbequiettonotspeakuptohidelikeachickinitsegg
Plasma cutters have double range in low pressure
2016-08-04 18:31:12 +03:00
Joan Lung
ce738acca7 touch 2016-08-03 12:46:32 -04:00
Igors Rjabcevs
a88da69f66 Prevent minigun from freezing Garbage Collector if it's spawned by itself; (#19666)
Also actually prevents minigun from firing if it's overheater;
2016-08-03 00:34:15 -05:00
Joan Lung
40b487e5ad Plasma cutters have double range in low pressure 2016-08-02 11:46:48 -04:00
Kyle Spier-Swenson
c9831c4afd [Ready]Makes space wind great again! (#19494)
* Makes space wind great again!
Space wind is now a scaling percent to move on pressure differences.
Space wind percent to move scales with pressure amount, and other modifers:
Actively moving (as in holding down a move key) reduces chance of getting moved by space wind by 30%
Having a wall or densed anchored object to your left or right (in terms of direction to be moved) will lower your chance to be moved in space wind by 20% in each direction. (so a wall on both sides is 40%) (Only applies to mob's with limbs)

* does the mrp
2016-07-28 09:43:51 +02:00