Commit Graph

1151 Commits

Author SHA1 Message Date
XDTM 30bfe13f81 Makes agent ids change name 2017-01-13 22:10:52 +01:00
Firecage 50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Kyle Spier-Swenson bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +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
Joan Lung feede86b09 Adds a proc for duplicate-avoiding associated list keys (#22608)
* Adds a proc for duplicate-avoiding associated list keys

* neat
2017-01-04 07:30:46 +13:00
kevinz000 079b377172 [READY]PAI PATCH 2 (#22214)
* shit

* shit2

* ...

* ....

* ...

* stuffs

* fixes

* dup

* stuff

* lights and jets

* ...

* wew

* ...

* ...

* wew

* ...

* ..

* .

* Update life.dm

* Update life.dm
2016-12-19 15:33:34 +13:00
MrPerson 94eac6ca0e Fix electric chairs not working sometimes (#22250)
Fixes #22155
2016-12-17 18:25:37 -05: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
kevinz000 bb80984957 [READY: I DID TEST]I pulled a goofball and broke pAIs (#22161)
* ghost notifications

* FUCK

* fuck2
2016-12-13 21:06:51 +13:00
kevinz000 1400a0d525 YOG pAIS PART 1 - MOBILE CHASSIS (#21871)
* pAI Candidate Verb

* sprites

* fuckxenos

* ...

* animal+alien

* ...

* ...

* ...

* progress

* ...

* .

* ...

* fixes

* ...

* ...

* ...

* ghostUI

* .

* .

* ...

* fixes

* ...

* BUNNIES

* ....

* ...

* merf

* nerfs
2016-12-13 14:47:03 +13:00
Cheridan 2dd1a87345 Merge pull request #22083 from ChangelingRain/multiplierspeed
Refactors toolspeed to be a multiplier instead of a divisor
2016-12-10 19:22:44 -06:00
blockheads 60b5f9d4b0 PDA fix #22038 (#22060)
* reset it

* fixes #22038, issue where pda wasn't displaying holding id/pen when using the messenger
2016-12-09 21:11:49 -05:00
Joan Lung 43ce2667f4 Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed 2016-12-09 18:03:43 -05:00
Joan Lung a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
Mervill 8daf8eab09 The light replacer can now consume glass shards (#21993)
* The light replacer can now consume glass shards to create bulbs

* woops

* Buff glass shards to be worth %75 precent of a glass sheet (currently 3)
2016-12-09 09:08:03 +13:00
Kyle Spier-Swenson dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
Joan Lung 9df03b0daf You can now cancel AI intellicard wiping (#21944)
* You can now cancel AI intellicard wiping

* OUTSIDE HELP
2016-12-06 11:53:00 +13:00
Joan Lung 551ede6d35 Kills all remaining text pronoun macros (#21916)
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
2016-12-04 21:32:31 +01:00
Mervill 3f68bd7202 Merge branch 'master' into a_intent
Conflicts:
	code/modules/mob/mob_defines.dm
2016-12-04 00:38:37 -08:00
WJohn 96c93f6b38 Merge pull request #21870 from KorPhaeron/cyborg_tools
Engineering Cyborg Tools Now Use the Default Sprites
2016-12-03 02:53:11 -05:00
Mervill 0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
KorPhaeron f77cd58b70 Cyborg Tools 2016-12-01 00:10:27 -06:00
Mervill 01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Mervill b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
oranges af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
KorPhaeron 9976f03112 Science Channel for Shaft Miners 2016-11-22 00:42:34 -05:00
Shadowlight213 008689c61c Adds AI Integrity restorer to program datums, various modular computer improvements (#21546)
* Ports AI restorer to modular computars

* mostly done. working on qdel improvments

* undoes testing flag

* undoes gc stuff

* Fixes id card module name

* memes
2016-11-19 13:33:39 +13:00
AnturK e1a4e8a1db Adds a ventriloquist dummy. (#21511)
* Dummy inital

* Adds dummies to meta and box.

* Minor inhand touchup

* Spelling and log
2016-11-14 12:04:55 +13:00
uraniummeltdown ea81370dce Cortical Borers (#21118)
Adds cortical borers, a midround antag originally from Bay. The code here is from yogstation, baystation and paradise station.

Borers are little brainslugs that when adjacent to a human can infest them. They can supply you with useful chemicals such as medicines and meth, and can revive you from the dead if they have maximum chemicals. They can also take over your body, putting them in control of you while you become a "captive mind". A captive mind can take back control by doing Resist. Health analyzers show borers in people, while medHUDs show borers in control. If you have Sugar in your body the borer can do nothing, it gets kicked out of control if it's controlling and becomes docile. Organ Manipulation surgery on head to remove the borer. If the brain of the body gets removed (decapitation, brain removal surgery, gibbing) the borer falls out of the host and loses control if they were controlling. Changelings can remove borers with Anatomic Panacea or Lesser Form (or Last Resort). Borers can reproduce and have an objective to escape on the shuttle with X hosts alive.
2016-11-10 09:25:41 +13:00
Mervill f88859309a wayward grammar 2016-11-06 14:53:41 -08:00
phil235 93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
phil235 59f2a4e10e Adds some image overlays on PDAs when they had an id (bottomleft corner green light), when their light is on (bottom right corner), when they have an item inserted (top), when they have a pai inserted (screen changes).
Also, altclicking a PDA without an ID now removed the inserted item.
Fixes some bugs. Simplifies id_check() proc.
2016-11-05 03:15:04 +01: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
Cyberboss dfbdbb5482 Fixes speaking being delayed by tcomms (#21020)
* Temporary workaround

* Made the better
2016-10-19 13:37:15 +13:00
phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02: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
MrPerson 5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
lordpidey 499cb6c7db Minor devil fixes (#20770)
* Replaces OBLIGATION_DRINK with a much more appropriate fiddle reference
Attempting to clone soulsellers no longer works.  Fun things happen if you try.
Fireproof paper no longer becomes unreadable on burning.
Made a generic "Conjure item" spell as a superclass for the summon pitchforks.  These spells summon/unsummon an item directly into your hand.
You can no longer spam ghosts with the infernal revival contract.

* Adds the sprites for the golden violin

* Fixes compile error.

* Small changes for AnturK

* I speel gud.
2016-10-18 08:45:45 +02:00
Joan Lung 4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
phil235 19cda8f56b Reorganizes the area folder to be more readable (multiple files instead of a big one with a million areas defined, moving areas that were defined outside the folder back into the folder).
Fixes issue with area power alerts, related to many space ruins using the same area and thus having multiple apcs in the same area with some wanting the area to be powered and some unpowered, leading to the area's power state constantly switching (area/procpoweralert() becoming the second most costly proc on the profile).
I fixed it by giving to many space ruins their own area (mostly those who have an APC).

Making a global list var "teleportbeacons" so we don't have to use "in world" to fing all tracking beacons used by teleporters.
2016-10-17 21:19:31 +02: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
Cuboos bf079d29d4 POWER TOOLS TAKE 2. (#20923)
New power tools for the CE! It's like goof's golden tools but less memey and makes more sense, power tools are much faster than normal tools and take the place of two.

Hand drill, activate to switch between between screwdriver bit and bolt bit (screwdriver/wrench)

Jaws of life, activate to switch between a cutting head and prying head, can also open powered doors like a xeno. Cutting head cuts your head off if you suicide with them. I wanted to make the prying head gib your head but i couldn't figure it out.

Reworked how construction handles sounds and added a new "usesound" var to obj/items. This is useful if you want to add another tool or item that makes a send when it's being used. Also useful if you want to replace a sound for an item or if you have an item with a choice of sounds (like if you have two versions of a sound sound you want to play)

CE now gets a unique white tool belt, exactly the same as a regular tool belt, just a re-skin.

CE also spawns with the new power tools and an experimental welder, CE will be the ONLY one to spawn with these tools, might make him a more valuable target for traitors. I figured this would be acceptable considering most heads are not antag enabled (i think)

Also i added a welding tool sound for reasons... figured might as well add some more sounds while i was reworking it.
2016-10-14 10:19:23 +13:00
Joan Lung ce13143d9d Replaces yet more istypes with helpers (#20806)
* uses more istype helpers

* oranges is inefficient
2016-10-10 17:48:35 +13:00
WJohn 5820fb452c Merge pull request #20862 from Kraseo/cypherkey
Resprites encryption keys
2016-10-09 21:33:12 -04: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
Kraseo 74ad8b66fb Resprites encryption keys, gives unique sprites to binary translation key and syndie encryption key. 2016-10-08 15:27:48 +02:00