Commit Graph

687 Commits

Author SHA1 Message Date
KorPhaeron
010f305ee2 Fixes portals moving anchored atoms (#22587)
* Fixes portals moving anchored objects

* Missing a letter

* Mecha
2017-01-02 15:07:11 +01:00
oranges
0010f34a1c Merge pull request #22432 from coiax/stops-sentient-event-complaining
Adds correct returns to sentience event
2016-12-26 14:53:24 +13:00
XDTM
bf9492b0f3 Maybe fixes kudzu 2016-12-26 01:45:49 +01:00
Jack Edge
a257df3e45 Adds correct returns to sentience event
I coded the ghost_role template, and yet I failed to code a new event
correctly.

I have fixed my mistakes, the sentience event no longer produces admin
complaints about bugs.
2016-12-24 13:31:20 +00:00
Incoming5643
123426b9c9 Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237) 2016-12-17 14:22:46 -05:00
coiax
43a08412a3 Anomalies now have observer-visible countdowns (#22147)
* Anomalies now have observer-visible countdowns

🆑 coiax
add: Anomalies now have observer-visible countdowns to their detonation.
/🆑

- Behind the scenes, moved the detonation code from the event to the
anomalies themselves. May be some differences of lifespan, given we're
going from event ticks to world.time, but meh.

* Changes the name of the anomaly cores
2016-12-16 11:08:05 +13:00
coiax
18647dd3d6 Added "Sentience" rare random event (#22007)
* Added "Sentience" rare random event

🆑 coiax
add: Due to a combination of radiation and water supply contamination,
stations have been reporting animals gaining self awareness.
/🆑

Picks a random /mob/living/simple_animal on station that has no mind,
and gives it to a ghost who signs up, along with giving them a decent
chunk of health so they don't die instantly.

Note that this does include bots, which I've kept because it's hilarious
that the Mulebot spontaneously develops opinions.

Cockroaches now take 1 damage when stepped on, enough to kill a normal
cockroach, but not enough to kill a sentient one.

* Changed min() to max()

* Changed lore to appease Cheridan
2016-12-10 10:04:56 +13:00
coiax
fcde5ac45d Enables the mice migration event (#21982)
* Enables the mice migration event

🆑 coiax
add: Additional mice sometimes appear in the maintenance tunnels.
Engineers beware!
/🆑

I probably had too much fun writing this.

* Fixes grammar mistake

OOC: Thunder12345: not more than 15 of rodents
2016-12-08 12:42:59 +13:00
Razharas
4993e2146b Merge pull request #21888 from XDTM/VineCodeScaresMe
Fixes a couple of kudzu bugs
2016-12-03 21:26:17 +04:00
XDTM
628f1fffe2 ) 2016-12-03 17:05:08 +01:00
XDTM
26b951d917 Fixes fixes 2016-12-03 16:57:37 +01: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
XDTM
e57eac4ffd Proper color init 2016-12-02 10:29:26 +01:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
XDTM
fc8d1d6be3 Fixed bugs 2016-12-02 00:46:49 +01:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Lzimann
2e8ef6c356 Adds the spawner to the maps 2016-11-25 19:25:48 -02:00
Lzimann
89a03ef577 Adds a new spawn xmas tree landmark and also adds a new holiday, the festive season. 2016-11-25 19:01:53 -02:00
coiax
ef42272bf6 Mice no longer spawn on grilles (#21603)
* Mice no longer spawn on grilles

Fixes #21574. Mice no longer spawn on cables that have dense objects
also on the tile.

Also added the Mice Migration event, used for debug purposes, currently
disabled.

* Uses proc that exists to check for density
2016-11-19 22:28:41 +13:00
phil235
0876b424a7 Tiny fixes and suggested changes.
Blight ability will still color your hair, and will be cleared when cured.
2016-11-01 01:59:23 +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
bgobandit
e7d0db78f1 The creepy clown epidemic has arrived at Space Station 13. (#21164)
* Implements a full spooky clown event for halloween.dm

* temp

* made requested fixes

* reeeee

* Clowns actually work now. Minor refactors to hallucination thanks oranges

* CLOWNS FINALLY WORK PROPERLY JESUS FUCK

* Fix incorrect prob method call
2016-10-30 19:51:19 +13:00
Shadowlight213
3d3fef9998 changes so only humans and lizards 2016-10-29 22:29:45 -07:00
Shadowlight213
d01b76172d removes species change from Halloween event 2016-10-29 22:05:29 -07:00
Cheridan
121271697f Merge pull request #21212 from optimumtact/ionlaws
Improves logging for ion laws
2016-10-29 00:45:32 -05:00
Xhuis
b22cc0543a [s] Adds new Halloween content (#21191)
* Adds new Halloween content

* Removes the delay

* Replaces archaic code

* Atomizes by removing unrelated tweaks

* Conflicts I

* Conflicts III, I think

* Unticks "halloween.dm"
2016-10-29 11:28:11 +13:00
oranges
b4dbc1003f Improves logging for ion laws
The actual ion law and which AI's it was added too is now logged for
later reference
2016-10-27 03:33:59 +00:00
bgobandit
b527745bc2 compiling is for cucks 2016-10-23 12:51:28 -04:00
bgobandit
77582f8d51 valentines and hearts only go to the living; added new messages 2016-10-23 12:41:40 -04:00
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
Cheridan
5646efe406 Merge pull request #21076 from Shadowlight213/swapstat
Fixes stat check in swap minds event
2016-10-20 17:17:43 -05:00
oranges
4404a01b51 Add logging for spiderlings spawned by botany + refactor spawning code (#21037)
Adds a log with an admin message for when spiderlings are spawned by a
botany user adding mutagen or adminordrazine, it also adds a helper
method for spawning atoms that supports a callback post spawn to
modify variables specific to the atom
2016-10-20 12:46:24 +02:00
Shadowlight213
0ae485cfbf fixes stat check in swap minds event 2016-10-19 08:41:55 -07:00
Leo
9cd27d136a Station Charter now keeps the server name in the game's window name after renaming the station (#21030)
* Charter now keeps the server name after renaming the station

* Changes instances of "world.name" to use the proper proc to get the station name.
2016-10-19 16:54:22 +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
oranges
c5e7e0ed2a Merge pull request #21031 from phil235/fix_spaceruin_map_shit
Area fixes
2016-10-18 09:28:35 +13: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
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
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
phil235
cc947b1eeb Fixes spacevines being immune to melee attack (typo). (#20907)
Fixes robotic legs missing a side to their sprite.
Fixes blob attacks destroying objs below intact floors (the blob's attack does not remove the floor's tile)
Now all objs hidden below floors don't take damage from fires, instead of just pipes and cables.
2016-10-12 09:01:03 +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
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
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
b8681e9f30 Merge branch 'master' of https://github.com/tgstation/-tg-station into EffectToStructure
# Conflicts:
#	code/modules/events/spacevine.dm
2016-09-27 20:03:26 +02:00