Commit Graph

836 Commits

Author SHA1 Message Date
TehZombehz 96b6cd36d7 Adds key logging to abandoned crate explosions (#22644)
* Adds key logging to abandoned crate explosions

Adds key logging to abandoned crate explosions in order to determine who
detonated an abandoned crate.

* Moves logging under user check

User logging only occurs if there's a user to log.

* Minor grammer update

The potential for 'has detonated a abandoned crate' bothered me.
2017-01-04 07:56:02 +13:00
Joan Lung 624ea1352c Adds a wrapper for flick_overlay() (#22642)
* Adds a wrapper for flick_overlay()

* are you sure
2017-01-04 07:55:45 +13:00
RandomMarine 4f8bf3e614 Catwalks now drop two rods when deconstructed. Also fixes metal duplication exploit. (#22488)
* catwalks now drop two rods

* fixes closets dropping more metal than takes to build
2016-12-29 10:06:14 +13:00
Cyberboss 1503cd8f18 Fixes a cardboardbox runtime (#22384)
* Fixes a cardboardbox runtime

* The better way
2016-12-23 13:30:09 +01:00
oranges c007b733df Merge pull request #22160 from jughu/C-y-c-l-e-r
adds cycler shotgun to wardens locker
2016-12-15 14:32:12 +13:00
XDTM 7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
jughu ed36797b79 Update security.dm 2016-12-13 06:24:07 +00:00
danno "big fucking moron" gonzales be20da226c Chaplain costumes and theater masks (#22109)
Ah hah hah ha! Ooh! Majestic! A hunter is a hunter, even in a dream. But, alas, not too fast! The nightmare swirls and churns unending!
2016-12-11 22:48:11 -05:00
Joan Lung a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
Mervill 0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Cyberboss a592e68f87 Viewers always returns a list (#21676) 2016-11-22 17:23:40 -05:00
Cyberboss f2808303ee Tweaks to the snakebox (#21530)
* The word snake makes no sense to me now

* Fixes volume

* Fixes spam

* Extra memes

* incap check

* Compile before commit

* Roast me Travis

* ... And moved

* Timing changeling

* Cheri has spoken
2016-11-19 13:36:07 +13:00
Cyberboss 316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
Mysak0CZ 87211b3e3d [ready for review]Minor locker tweaks (#21494)
* you can anchor lockers using wrench, minor tweaks

* AIs and Cyborgs procs addition

* Spelling update

* Removed silicon remote control
2016-11-13 17:14:14 +13:00
KorPhaeron 629bfb6c5e Cloaks are now cosmetic neck slot items (#21418)
* Cloaks are now cosmetic neck slot items

* Re-orders layers so bags will display above cloaks
2016-11-10 09:30:25 +13:00
phil235 b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
chowdermcarthor c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Screemonster 60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893)
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
2016-10-21 15:30:46 +13:00
phil235 240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
oranges 86a8d8a7f5 Merge pull request #20962 from phil235/hit_message
No more message spam when you witness someone being attacked or shot
2016-10-18 09:17:41 +13:00
Shadowlight213 18709e5ad7 Revert "Makes drag/drop that dont have any use call click" 2016-10-16 12:41:42 -07:00
Joan Lung 7371d36b2c Merge pull request #20978 from phil235/StatueShit
Unfuck the statue code.
2016-10-16 12:43:43 -04:00
Joan Lung 1d075c6227 Merge pull request #20976 from phil235/bodybedQoL
Clicking a floor with a bodybag or roller bed now deploys them directly.
2016-10-16 12:42:27 -04:00
phil235 f6db08af2e Contents_explosion() tweaks (#20934)
* When any object is hit by an explosion, we no longer always call ex_act() on all its contents indiscriminately.
The default contents_explosion() does nothing and it's overriden for certain objects only like storage items, machines with occupants, mechs.

I've also overriden handle_atom_del() for many objects so that any sudden deletion of an object referenced in an object var of its container properly nullifies such references, avoiding potential runtime and updating the container's icon_state (e.g. admin-delete a mixer's beaker and the mixer's sprite updates immediately).

I've tweaked bomb effect on worn clothes, having some armor but not 100% now still protects your clothes somewhat.

Fixes some arguments of ex_act in living/ex_act() and other mobs.

* derp and map fixes.

* dem map fixes, man.

* More work on code that use implants, simplified now that we can use the "implants" carbon var.

* some fixes

* more typos and fixes.
2016-10-16 10:01:37 +13:00
phil235 8c79ad4eab derp 2016-10-14 21:12:19 +02:00
phil235 cd825493cf Unfuck the statue code. 2016-10-14 21:04:52 +02:00
phil235 64c528e115 Clicking a floor with a bodybag or roller bed now deploys them directly.
When deployed, the bodybag automatically starts "open" now.
Tweaked the amount of metal dropped by destroyed closets.
Bodybag structures no longer drop metal on destruction.
Admin deleting a critter crate no longer drops wood, but it still does when destroyed and the wood it drops is now all in a single stack.
Added a drop_material_amount var to closets to make the amount of material dropped vary for different closet types.
Click dragging a roller bed now puts it in your hand after being folded (for consistency with bodybag)
Cardboard box closets no longer have an integrity failure level (there's no opening mechanism to break in a cardboard box...). Same for bodybag "closets".
2016-10-14 17:47:16 +02:00
phil235 43812be1b0 Merge branch 'master' of https://github.com/tgstation/-tg-station into hit_message
# Conflicts:
#	code/game/mecha/mecha_defense.dm
2016-10-13 20:04:59 +02:00
phil235 1ea0e47aa4 Visible_message() when being attacked by melee or projectile is replaced by a simple message only to the target instead of all viewers.
The message when firing a gun is removed.
To keep things balanced melee attacks (punches, alien attacks, animal attacks, etc...) now show a visual effect (similar to what we current have with item attacks.
Fixes muzzle flash effect not appearing for mech guns.
Fixes muzzle flash effect not appearing for certain ranged animal.
Fixes the item attack effect not being visible to camera viewers and mech occupants.
Fixes toy guns foam dart not dropping on the ground when shooting a mob on the same tile as us.
Fixes toy smg magazine sprite being invisible sometimes.
Fixes foam dart not facing the correct direction when fired.
Changes the bullet projectile sprite to have a slight tracer effect so as to be more visible.
2016-10-13 19:21:30 +02:00
Razharas 7753b04a6c Makes drag/drop that dont have any use call click (#20774)
Makes drag/drop that dont have any particular defined behaviour be treated as just click on the dragged object
2016-10-13 12:55:05 +13:00
Joan Lung a88eb76aec Remove an unused proc #20825 2016-10-10 11:47:14 +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
Incoming 5eacff1038 Merge branch 'master' of https://github.com/tgstation/-tg-station into hold_it
# Conflicts:
#	code/modules/clothing/under/ties.dm
2016-09-30 13:00:49 -04:00
phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
2016-09-29 01:44:27 +02:00
Incoming 83eef6662b ties the lawyer speech bubble to the attorney's badge so lawyers can disguise and people can disguise as lawyers
additional badges are found in the law closet

Needs an icon
2016-09-27 19:59:23 -04: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
phil235 6809603669 Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.
Adds a large ash and large molten item decal (for future use)
simplifies decal/cleanable/replace_decal() code a bit.
Changes construction() proc to on_construction() for consistency, same for deconstruction().
Made a deconstruct() proc for machinery and computer (also for future use).
2016-09-27 19:58:27 +02:00
oranges 04a42ee479 Merge pull request #20647 from KorPhaeron/bossofthisgym
Boss of this Fitness Room
2016-09-25 12:31:33 +13:00
KorPhaeron 692f809e28 Boss of this Gym 2016-09-22 21:32:08 -05:00
jughu a568fb9632 fixes the emergency locker 2016-09-03 01:07:41 +02:00
TechnoAlchemist 6cb1bda8e4 Adds a seclite to the detective's closet. 2016-08-22 13:21:31 -07:00
Joan Lung cbf733dbc4 Does something, likely to be important, to blob (#19831)
🆑 Joan
rscadd: Once the blob alert message is sent in the blob game mode, all mobs get to see how many tiles the blob has until it wins, via the Status tab.
rscdel: Removed/merged a bunch of blob chems, you probably don't care about the specifics.
tweak: The remaining blob chems should, overall, be more powerful.
tweak: Shield blobs soak brute damage less well.
tweak: Flashbangs do higher damage to blobs up close, but their damage falls off faster.
experiment: Shield blobs now cost 15 resources to make instead of 10. Node blobs now cost 50 resources to make instead of 60.
experiment: Expanding/attacking now costs 4 resources instead of 5, and blobs can now ATTACK DIAGONALLY. Diagonal attacks are weaker than normal attacks, especially against cyborgs(which may be entirely immune, depending), and they remain unable to expand diagonally.
rscadd: Shield blobs no longer block atmos while under half health. Shield blobs are still immune to fire, even if they can't block atmos.
tweak: Blobs should block explosions less well.
rscadd: Blob cores and nodes are no longer immune to fire and no longer block atmos.
rscadd: Blobs can only auto-expand one tile at a time per expanding thing, and should be easier to beat back in general.
tweak: Blobbernauts now attack faster.
tweak: Blob Overminds attack mobs slower but can attack non-mobs much faster.
rscadd: Blob Overminds start with some amount of resources; in the gamemode, it's 80 divided by the number of overminds, in the event, it's 20 plus the number of active players, and otherwise, it's 60.
bugfix: You can no longer move blob cores into space, onto the mining shuttle, white ship, gulag shuttle, or solars.
bugfix: Blob rounds might be less laggy, if they were laggy?
tweak: Blobs don't heal as fast, excluding the core.
experiment: Blobs are marginally less destructive to their environment.
/🆑

Objective:
maybe possibly make blob something you can fight instead of wishing the blob didn't exist?
but also make the blob lethal enough that it can still deal with the crew if it knows what it's doing(and still lose if the crew is good instead of snowballing forever)
2016-08-17 15:48:28 +12:00
oranges bbf8889d9c Merge pull request #19810 from KorPhaeron/blueprint_fix
Refactors area creation
2016-08-15 00:01:00 +12:00
KorPhaeron 43a16713f1 Blueprints for everyone 2016-08-11 04:04:16 -05:00
KorPhaeron 2a71f7e3b2 Fixes realism issues with rapiers being able to dismember (#19779)
* Rapier Fixes

* Typo

* Rapiers are not canon

* Removes rogue apostrophe
2016-08-11 15:43:18 +12:00
bawhoppen 1fecd12aaf no really who is da king (#19537)
add: Added crowns. Make them from gold. Cap gets a fancy one.

Crowns get some armor but are overall worse than sec gear.
2016-08-01 13:58:11 +12:00
Thunder12345 1220d02aca Rapiers (#19340)
* Adds Rapiers
2016-07-26 15:14:11 +02:00
Joan Lung e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow
Makes crayons not racist anymore
2016-07-23 18:40:10 -04:00