cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-04 22:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,998 Commits 60 Branches 14 Tags
6cfd99ec00a7841002fd6d14eae664adb6bd5b7e
Commit Graph

4624 Commits

Author SHA1 Message Date
phil235
6cfd99ec00 Moving shit around and APC repair bugfix (#20912) 
* Moving shit around so turfs aren't defined in code/modules/mining .
Fixes APC's integrity not being reset to max when a broken APC is repaired.

* derp

* More turf and turf procs moved.

* fixing merge conflicts again.
 2016-10-12 09:48:47 +02:00
Cyberboss
a2a9dc7c60 Fixes motion alarms (#20899) 
Fixed motion alarms instantly triggering and de/un/re/triggering

The relevant changes are in motion.dm and ai_monitored.dm. 

Everything else is a replacement of /area/turret_protected -> /area/ai_monitored/turret_protected which is why this PR is a bitch
 2016-10-12 15:52:49 +13:00
Joan Lung
2f6f8a4748 Fixes antag spawners (#20882) 
* Fixes antag spawners

* compiling is nice

* Let's assume usr has died...

* wizaaaard

* no runtimes
 2016-10-12 09:53:47 +13:00
Cheridan
e0c8f9bb12 Merge pull request #20887 from ChangelingRain/clockcultfixes 
Clockcult fixes
 2016-10-11 07:52:53 -05:00
Cheridan
1eadedea97 Merge pull request #20810 from optimumtact/malflists 
Better check for milestone in the doomsday device
 2016-10-10 16:18:33 -05:00
Joan Lung
f51444d8fa Improves some cult rune checks (#20872) 
* sword in the dawn

* don't fade away

* it's dumb, but not my problem.
also rearrange these checks~
 2016-10-11 10:05:25 +13:00
oranges
1a9d1491c1 Better check for milestone in the doomsday device 
This prevents a list index out of bounds runtime by doing the check via
byonds in operator instead

This should also ensure milestones are set properly
 2016-10-10 05:03:11 +00: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
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
swindly
368c99bdf2 Removes unseen message from Cellular Emporium (#20865) 
* removes unseen message from cellular emporium

* removes unused value
 2016-10-10 12:16:10 +13:00
Supermichael777
b1c0a48e0c Fixes #20839 No more double yolk demons (#20848) 
* hopefully this prevents the double use edgecase

Fun fact this never actually checked whether it was used up

* My first language I swear

* I supose you could use it to spam ghosts
 2016-10-10 11:37:37 +13:00
oranges
504fdf5bea Merge pull request #20771 from ExcessiveUseOfCobblestone/devil-antaghud 
Changes the hud "demon" into "devil" and changes sin to sintouched in the antaghud generators.
 2016-10-10 11:19:53 +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
31a46f3349 RATVAR_ALLOY_CHECK =/= 0 2016-10-09 14:04:28 -04:00
Joan Lung
0799c0c37a Clockcult fixes 2016-10-09 14:03:12 -04: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
Cheridan
6987882e51 Merge pull request #20784 from ChangelingRain/itworkssortofexceptforthebugs 
Fixes "Datum Antagonists"
 2016-10-01 15:23:40 -05:00
Joan Lung
dd9a3e9c9a did I actually test anything? 2016-10-01 14:47:42 -04: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
d6ba32394c Merge pull request #20751 from XDTM/GentleAbductors 
Abduction Tweaks
 2016-10-01 13:22:40 -04:00
ExcessiveUseOfCobblestone
6813956bd5 modified: _maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm 
modified:   _maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
 	modified:   _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
 	modified:   _maps/RandomRuins/SpaceRuins/spacebar.dmm
 	modified:   _maps/RandomZLevels/Academy.dmm
 	modified:   _maps/RandomZLevels/caves.dmm
 	modified:   _maps/RandomZLevels/moonoutpost19.dmm
 	modified:   _maps/RandomZLevels/snowdin.dmm
 	modified:   _maps/RandomZLevels/undergroundoutpost45.dmm
 	modified:   _maps/map_files/BirdStation/BirdStation.dmm
 	modified:   _maps/map_files/DreamStation/dreamstation04.dmm
 	modified:   _maps/map_files/EfficiencyStation/EfficiencyStation.dmm
 	modified:   _maps/map_files/MetaStation/MetaStation.dmm
 	deleted:    _maps/map_files/MiniStation/uplink_item.dm
 	modified:   _maps/map_files/TgStation/tgstation.2.1.3.dmm
 	modified:   _maps/map_files/generic/z2.dmm
 	modified:   _maps/ministation.dm
 	modified:   code/__DEFINES/misc.dm
 	modified:   code/__HELPERS/game.dm
 	modified:   code/__HELPERS/lists.dm
 	new file:   code/__HELPERS/pronouns.dm
 	modified:   code/__HELPERS/unsorted.dm
 	modified:   code/_globalvars/lists/objects.dm
 	modified:   code/_onclick/hud/screen_objects.dm
 	modified:   code/controllers/subsystem/persistence.dm
 	modified:   code/controllers/subsystem/processing/objects.dm
 	new file:   code/datums/antagonists/antag_datum.dm
 	new file:   code/datums/antagonists/datum_clockcult.dm
 	new file:   code/datums/antagonists/datum_cult.dm
 	modified:   code/datums/diseases/_MobProcs.dm
 	modified:   code/datums/diseases/advance/symptoms/beard.dm
 	modified:   code/datums/diseases/advance/symptoms/damage_converter.dm
 	modified:   code/datums/diseases/advance/symptoms/shedding.dm
 	modified:   code/datums/diseases/advance/symptoms/skin.dm
 	modified:   code/datums/diseases/advance/symptoms/youth.dm
 	modified:   code/datums/diseases/wizarditis.dm
 	modified:   code/datums/helper_datums/getrev.dm
 	modified:   code/datums/helper_datums/teleport.dm
 	modified:   code/datums/martial/krav_maga.dm
 	modified:   code/datums/mind.dm
 	modified:   code/datums/status_effects/buffs.dm
 	modified:   code/game/area/areas.dm
 	modified:   code/game/asteroid.dm
 	modified:   code/game/atoms.dm
 	modified:   code/game/atoms_movable.dm
 	modified:   code/game/gamemodes/antag_spawner.dm
 	modified:   code/game/gamemodes/blob/blobs/blob_mobs.dm
 	modified:   code/game/gamemodes/blob/blobs/core.dm
 	modified:   code/game/gamemodes/blob/blobs/factory.dm
 	modified:   code/game/gamemodes/blob/blobs/node.dm
 	modified:   code/game/gamemodes/blob/blobs/resource.dm
 	modified:   code/game/gamemodes/blob/blobs/shield.dm
 	modified:   code/game/gamemodes/blob/overmind.dm
 	modified:   code/game/gamemodes/blob/powers.dm
 	modified:   code/game/gamemodes/blob/theblob.dm
 	modified:   code/game/gamemodes/changeling/powers/mutations.dm
 	modified:   code/game/gamemodes/changeling/powers/spiders.dm
 	modified:   code/game/gamemodes/clock_cult/clock_cult.dm
 	modified:   code/game/gamemodes/clock_cult/clock_items.dm
 	modified:   code/game/gamemodes/clock_cult/clock_mobs.dm
 	modified:   code/game/gamemodes/clock_cult/clock_ratvar.dm
 	modified:   code/game/gamemodes/clock_cult/clock_scripture.dm
 	modified:   code/game/gamemodes/clock_cult/clock_structures.dm
 	modified:   code/game/gamemodes/cult/cult.dm
 	modified:   code/game/gamemodes/cult/cult_items.dm
 	modified:   code/game/gamemodes/cult/cult_structures.dm
 	modified:   code/game/gamemodes/cult/runes.dm
 	modified:   code/game/gamemodes/devil/devil.dm
 	modified:   code/game/gamemodes/devil/devilinfo.dm
 	modified:   code/game/gamemodes/devil/game_mode.dm
 	modified:   code/game/gamemodes/game_mode.dm
 	modified:   code/game/gamemodes/gang/dominator.dm
 	modified:   code/game/gamemodes/gang/gang.dm
 	modified:   code/game/gamemodes/gang/gang_datum.dm
 	modified:   code/game/gamemodes/meteor/meteors.dm
 	modified:   code/game/gamemodes/miniantags/abduction/abduction_gear.dm
 	modified:   code/game/gamemodes/miniantags/abduction/gland.dm
 	modified:   code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
 	modified:   code/game/gamemodes/miniantags/revenant/revenant.dm
 	modified:   code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
 	modified:   code/game/gamemodes/nuclear/nuclear.dm
 	modified:   code/game/gamemodes/nuclear/nuclearbomb.dm
 	modified:   code/game/gamemodes/objective.dm
 	modified:   code/game/gamemodes/revolution/revolution.dm
 	modified:   code/game/gamemodes/wizard/artefact.dm
 	modified:   code/game/gamemodes/wizard/soulstone.dm
 	modified:   code/game/gamemodes/wizard/spellbook.dm
 	modified:   code/game/machinery/autolathe.dm
 	modified:   code/game/machinery/camera/camera.dm
 	modified:   code/game/machinery/camera/tracking.dm
 	modified:   code/game/machinery/computer/computer.dm
 	modified:   code/game/machinery/computer/medical.dm
 	modified:   code/game/machinery/computer/prisoner.dm
 	modified:   code/game/machinery/computer/security.dm
 	modified:   code/game/machinery/constructable_frame.dm
 	modified:   code/game/machinery/deployable.dm
 	modified:   code/game/machinery/doors/door.dm
 	modified:   code/game/machinery/doors/windowdoor.dm
 	modified:   code/game/machinery/firealarm.dm
 	modified:   code/game/machinery/flasher.dm
 	modified:   code/game/machinery/iv_drip.dm
 	modified:   code/game/machinery/limbgrower.dm
 	modified:   code/game/machinery/machinery.dm
 	modified:   code/game/machinery/newscaster.dm
 	modified:   code/game/machinery/overview.dm
 	modified:   code/game/machinery/pipe/construction.dm
 	modified:   code/game/machinery/porta_turret/portable_turret.dm
 	modified:   code/game/machinery/shieldgen.dm
 	modified:   code/game/machinery/spaceheater.dm
 	modified:   code/game/machinery/syndicatebeacon.dm
 	modified:   code/game/machinery/syndicatebomb.dm
 	modified:   code/game/machinery/vending.dm
 	modified:   code/game/mecha/combat/combat.dm
 	modified:   code/game/mecha/combat/durand.dm
 	modified:   code/game/mecha/combat/gygax.dm
 	modified:   code/game/mecha/combat/marauder.dm
 	modified:   code/game/mecha/combat/phazon.dm
 	modified:   code/game/mecha/combat/reticence.dm
 	modified:   code/game/mecha/equipment/tools/mining_tools.dm
 	modified:   code/game/mecha/equipment/tools/other_tools.dm
 	modified:   code/game/mecha/equipment/tools/work_tools.dm
 	modified:   code/game/mecha/equipment/weapons/weapons.dm
 	modified:   code/game/mecha/mech_fabricator.dm
 	modified:   code/game/mecha/mecha.dm
 	modified:   code/game/mecha/mecha_defense.dm
 	modified:   code/game/mecha/working/ripley.dm
 	modified:   code/game/objects/buckling.dm
 	modified:   code/game/objects/effects/alien_acid.dm
 	modified:   code/game/objects/effects/anomalies.dm
 	modified:   code/game/objects/effects/contraband.dm
 	modified:   code/game/objects/effects/decals/Cleanable/aliens.dm
 	modified:   code/game/objects/effects/decals/Cleanable/humans.dm
 	modified:   code/game/objects/effects/decals/Cleanable/misc.dm
 	modified:   code/game/objects/effects/decals/Cleanable/robots.dm
 	modified:   code/game/objects/effects/decals/cleanable.dm
 	modified:   code/game/objects/effects/effect_system/effect_system.dm
 	modified:   code/game/objects/effects/effect_system/effects_foam.dm
 	modified:   code/game/objects/effects/effect_system/effects_smoke.dm
 	new file:   code/game/objects/effects/effects.dm
 	modified:   code/game/objects/effects/forcefields.dm
 	modified:   code/game/objects/effects/glowshroom.dm
 	modified:   code/game/objects/effects/landmarks.dm
 	modified:   code/game/objects/effects/manifest.dm
 	modified:   code/game/objects/effects/misc.dm
 	modified:   code/game/objects/effects/overlays.dm
 	modified:   code/game/objects/effects/portals.dm
 	modified:   code/game/objects/effects/spiders.dm
 	modified:   code/game/objects/explosion.dm
 	modified:   code/game/objects/items.dm
 	modified:   code/game/objects/items/cardboard_cutouts.dm
 	modified:   code/game/objects/items/dehy_carp.dm
 	modified:   code/game/objects/items/devices/PDA/PDA.dm
 	modified:   code/game/objects/items/devices/camera_bug.dm
 	modified:   code/game/objects/items/devices/flashlight.dm
 	modified:   code/game/objects/items/devices/instruments.dm
 	modified:   code/game/objects/items/devices/radio/electropack.dm
 	modified:   code/game/objects/items/latexballoon.dm
 	modified:   code/game/objects/items/robot/robot_parts.dm
 	modified:   code/game/objects/items/robot/robot_upgrades.dm
 	modified:   code/game/objects/items/stacks/cash.dm
 	modified:   code/game/objects/items/stacks/medical.dm
 	modified:   code/game/objects/items/stacks/sheets/mineral.dm
 	modified:   code/game/objects/items/stacks/sheets/sheet_types.dm
 	modified:   code/game/objects/items/stacks/tiles/tile_types.dm
 	modified:   code/game/objects/items/stacks/wrap.dm
 	modified:   code/game/objects/items/toys.dm
 	modified:   code/game/objects/items/trash.dm
 	modified:   code/game/objects/items/weapons/cards_ids.dm
 	modified:   code/game/objects/items/weapons/chrono_eraser.dm
 	modified:   code/game/objects/items/weapons/cigs_lighters.dm
 	modified:   code/game/objects/items/weapons/clown_items.dm
 	modified:   code/game/objects/items/weapons/courtroom.dm
 	modified:   code/game/objects/items/weapons/gift.dm
 	modified:   code/game/objects/items/weapons/grenades/flashbang.dm
 	modified:   code/game/objects/items/weapons/grenades/grenade.dm
 	modified:   code/game/objects/items/weapons/grenades/smokebomb.dm
 	modified:   code/game/objects/items/weapons/holosign_creator.dm
 	modified:   code/game/objects/items/weapons/implants/implant.dm
 	modified:   code/game/objects/items/weapons/implants/implant_chem.dm
 	modified:   code/game/objects/items/weapons/mop.dm
 	modified:   code/game/objects/items/weapons/paint.dm
 	modified:   code/game/objects/items/weapons/scrolls.dm
 	modified:   code/game/objects/items/weapons/shields.dm
 	modified:   code/game/objects/items/weapons/signs.dm
 	modified:   code/game/objects/items/weapons/singularityhammer.dm
 	modified:   code/game/objects/items/weapons/storage/backpack.dm
 	modified:   code/game/objects/items/weapons/storage/bags.dm
 	modified:   code/game/objects/items/weapons/storage/belt.dm
 	modified:   code/game/objects/items/weapons/storage/book.dm
 	modified:   code/game/objects/items/weapons/storage/boxes.dm
 	modified:   code/game/objects/items/weapons/storage/briefcase.dm
 	modified:   code/game/objects/items/weapons/storage/fancy.dm
 	modified:   code/game/objects/items/weapons/storage/secure.dm
 	modified:   code/game/objects/items/weapons/storage/storage.dm
 	modified:   code/game/objects/items/weapons/storage/wallets.dm
 	modified:   code/game/objects/items/weapons/tanks/tanks.dm
 	modified:   code/game/objects/items/weapons/tanks/watertank.dm
 	modified:   code/game/objects/items/weapons/twohanded.dm
 	modified:   code/game/objects/items/weapons/weaponry.dm
 	modified:   code/game/objects/objs.dm
 	modified:   code/game/objects/structures.dm
 	modified:   code/game/objects/structures/ai_core.dm
 	modified:   code/game/objects/structures/aliens.dm
 	modified:   code/game/objects/structures/artstuff.dm
 	modified:   code/game/objects/structures/beds_chairs/bed.dm
 	modified:   code/game/objects/structures/beds_chairs/chair.dm
 	modified:   code/game/objects/structures/bedsheet_bin.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/gimmick.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/job_closets.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/secure/bar.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/secure/personal.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/statue.dm
 	modified:   code/game/objects/structures/displaycase.dm
 	modified:   code/game/objects/structures/fireaxe.dm
 	modified:   code/game/objects/structures/fireplace.dm
 	modified:   code/game/objects/structures/flora.dm
 	modified:   code/game/objects/structures/girders.dm
 	modified:   code/game/objects/structures/grille.dm
 	modified:   code/game/objects/structures/guncase.dm
 	modified:   code/game/objects/structures/lattice.dm
 	modified:   code/game/objects/structures/mineral_doors.dm
 	modified:   code/game/objects/structures/noticeboard.dm
 	modified:   code/game/objects/structures/plasticflaps.dm
 	modified:   code/game/objects/structures/safe.dm
 	modified:   code/game/objects/structures/signs.dm
 	modified:   code/game/objects/structures/table_frames.dm
 	modified:   code/game/objects/structures/tables_racks.dm
 	modified:   code/game/objects/structures/watercloset.dm
 	modified:   code/game/objects/structures/window.dm
 	modified:   code/game/turfs/simulated/floor.dm
 	modified:   code/game/turfs/simulated/floor/plating.dm
 	modified:   code/game/turfs/simulated/floor/warning.dm
 	modified:   code/game/turfs/simulated/walls.dm
 	modified:   code/modules/admin/topic.dm
 	modified:   code/modules/admin/verbs/debug.dm
 	modified:   code/modules/admin/verbs/randomverbs.dm
 	modified:   code/modules/assembly/flash.dm
 	modified:   code/modules/assembly/proximity.dm
 	modified:   code/modules/atmospherics/environmental/LINDA_fire.dm
 	modified:   code/modules/atmospherics/machinery/atmosmachinery.dm
 	modified:   code/modules/atmospherics/machinery/components/components_base.dm
 	modified:   code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
 	modified:   code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
 	modified:   code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
 	modified:   code/modules/atmospherics/machinery/portable/canister.dm
 	modified:   code/modules/awaymissions/gateway.dm
 	modified:   code/modules/awaymissions/mission_code/snowdin.dm
 	modified:   code/modules/awaymissions/mission_code/stationCollision.dm
 	modified:   code/modules/awaymissions/mission_code/wildwest.dm
 	modified:   code/modules/client/preferences.dm
 	modified:   code/modules/clothing/chameleon.dm
 	modified:   code/modules/clothing/clothing.dm
 	modified:   code/modules/clothing/glasses/engine_goggles.dm
 	modified:   code/modules/clothing/glasses/glasses.dm
 	modified:   code/modules/clothing/gloves/color.dm
 	modified:   code/modules/clothing/gloves/miscellaneous.dm
 	modified:   code/modules/clothing/head/collectable.dm
 	modified:   code/modules/clothing/head/hardhat.dm
 	modified:   code/modules/clothing/head/helmet.dm
 	modified:   code/modules/clothing/head/jobs.dm
 	modified:   code/modules/clothing/head/misc.dm
 	modified:   code/modules/clothing/head/misc_special.dm
 	modified:   code/modules/clothing/head/soft_caps.dm
 	modified:   code/modules/clothing/masks/breath.dm
 	modified:   code/modules/clothing/masks/gasmask.dm
 	modified:   code/modules/clothing/masks/hailer.dm
 	modified:   code/modules/clothing/shoes/magboots.dm
 	modified:   code/modules/clothing/shoes/miscellaneous.dm
 	modified:   code/modules/clothing/spacesuits/chronosuit.dm
 	modified:   code/modules/clothing/spacesuits/hardsuit.dm
 	modified:   code/modules/clothing/spacesuits/miscellaneous.dm
 	modified:   code/modules/clothing/spacesuits/plasmamen.dm
 	modified:   code/modules/clothing/spacesuits/syndi.dm
 	modified:   code/modules/clothing/suits/armor.dm
 	modified:   code/modules/clothing/suits/bio.dm
 	modified:   code/modules/clothing/suits/cloaks.dm
 	modified:   code/modules/clothing/suits/jobs.dm
 	modified:   code/modules/clothing/suits/labcoat.dm
 	modified:   code/modules/clothing/suits/miscellaneous.dm
 	modified:   code/modules/clothing/suits/utility.dm
 	modified:   code/modules/clothing/suits/wiz_robe.dm
 	modified:   code/modules/clothing/under/color.dm
 	modified:   code/modules/clothing/under/jobs/civilian.dm
 	modified:   code/modules/clothing/under/jobs/engineering.dm
 	modified:   code/modules/clothing/under/jobs/medsci.dm
 	modified:   code/modules/clothing/under/jobs/security.dm
 	modified:   code/modules/clothing/under/miscellaneous.dm
 	modified:   code/modules/clothing/under/syndicate.dm
 	modified:   code/modules/clothing/under/ties.dm
 	modified:   code/modules/clothing/under/trek.dm
 	modified:   code/modules/events/blob.dm
 	modified:   code/modules/events/holiday/vday.dm
 	modified:   code/modules/events/holiday/xmas.dm
 	modified:   code/modules/events/immovable_rod.dm
 	modified:   code/modules/events/shuttle_loan.dm
 	modified:   code/modules/events/spacevine.dm
 	modified:   code/modules/events/spider_infestation.dm
 	modified:   code/modules/events/wizard/greentext.dm
 	modified:   code/modules/events/wizard/rpgloot.dm
 	modified:   code/modules/flufftext/Hallucination.dm
 	modified:   code/modules/food_and_drinks/drinks/drinks.dm
 	modified:   code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
 	modified:   code/modules/food_and_drinks/food.dm
 	modified:   code/modules/food_and_drinks/food/snacks/meat.dm
 	modified:   code/modules/food_and_drinks/food/snacks_other.dm
 	modified:   code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
 	modified:   code/modules/games/cards.dm
 	modified:   code/modules/holodeck/area_copy.dm
 	modified:   code/modules/holodeck/computer.dm
 	modified:   code/modules/hydroponics/grown.dm
 	modified:   code/modules/hydroponics/grown/flowers.dm
 	modified:   code/modules/hydroponics/grown/kudzu.dm
 	modified:   code/modules/hydroponics/grown/mushrooms.dm
 	modified:   code/modules/hydroponics/grown/nettle.dm
 	modified:   code/modules/hydroponics/grown/replicapod.dm
 	modified:   code/modules/hydroponics/grown/towercap.dm
 	modified:   code/modules/hydroponics/growninedible.dm
 	modified:   code/modules/hydroponics/hydroponics.dm
 	modified:   code/modules/hydroponics/seeds.dm
 	modified:   code/modules/jobs/access.dm
 	modified:   code/modules/jobs/job_types/civilian.dm
 	modified:   code/modules/library/lib_codex_gigas.dm
 	modified:   code/modules/library/lib_items.dm
 	modified:   code/modules/library/lib_machines.dm
 	modified:   code/modules/mining/equipment.dm
 	modified:   code/modules/mining/fulton.dm
 	modified:   code/modules/mining/lavaland/ash_flora.dm
 	modified:   code/modules/mining/lavaland/necropolis_chests.dm
 	modified:   code/modules/mining/machine_redemption.dm
 	modified:   code/modules/mining/mine_items.dm
 	modified:   code/modules/mining/mine_turfs.dm
 	modified:   code/modules/mining/money_bag.dm
 	modified:   code/modules/mob/interactive.dm
 	modified:   code/modules/mob/inventory.dm
 	modified:   code/modules/mob/living/bloodcrawl.dm
 	modified:   code/modules/mob/living/brain/brain.dm
 	modified:   code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
 	modified:   code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
 	modified:   code/modules/mob/living/carbon/carbon_defense.dm
 	modified:   code/modules/mob/living/carbon/examine.dm
 	modified:   code/modules/mob/living/carbon/human/examine.dm
 	modified:   code/modules/mob/living/carbon/human/human.dm
 	modified:   code/modules/mob/living/carbon/human/human_defense.dm
 	modified:   code/modules/mob/living/carbon/human/inventory.dm
 	modified:   code/modules/mob/living/carbon/human/species_types.dm
 	modified:   code/modules/mob/living/carbon/human/whisper.dm
 	modified:   code/modules/mob/living/carbon/monkey/monkey_defense.dm
 	modified:   code/modules/mob/living/carbon/update_icons.dm
 	modified:   code/modules/mob/living/living.dm
 	modified:   code/modules/mob/living/say.dm
 	modified:   code/modules/mob/living/silicon/ai/ai.dm
 	modified:   code/modules/mob/living/silicon/ai/ai_defense.dm
 	modified:   code/modules/mob/living/silicon/pai/pai_defense.dm
 	modified:   code/modules/mob/living/silicon/pai/software.dm
 	modified:   code/modules/mob/living/silicon/robot/robot.dm
 	modified:   code/modules/mob/living/silicon/robot/robot_defense.dm
 	modified:   code/modules/mob/living/simple_animal/animal_defense.dm
 	modified:   code/modules/mob/living/simple_animal/bot/ed209bot.dm
 	modified:   code/modules/mob/living/simple_animal/bot/secbot.dm
 	modified:   code/modules/mob/living/simple_animal/constructs.dm
 	modified:   code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
 	modified:   code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
 	modified:   code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
 	modified:   code/modules/mob/living/simple_animal/friendly/farm_animals.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/bear.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/giant_spider.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/illusion.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
 	modified:   code/modules/mob/living/simple_animal/hostile/statue.dm
 	modified:   code/modules/mob/living/simple_animal/shade.dm
 	modified:   code/modules/mob/living/simple_animal/simple_animal.dm
 	modified:   code/modules/mob/living/simple_animal/slime/life.dm
 	modified:   code/modules/mob/mob.dm
 	modified:   code/modules/mob/mob_transformation_simple.dm
 	modified:   code/modules/modular_computers/computers/item/computer.dm
 	modified:   code/modules/ninja/energy_katana.dm
 	modified:   code/modules/ninja/ninja_event.dm
 	modified:   code/modules/ninja/suit/gloves.dm
 	modified:   code/modules/ninja/suit/head.dm
 	modified:   code/modules/ninja/suit/mask.dm
 	modified:   code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
 	modified:   code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
 	modified:   code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm
 	modified:   code/modules/ninja/suit/ninjaDrainAct.dm
 	modified:   code/modules/ninja/suit/shoes.dm
 	modified:   code/modules/ninja/suit/suit.dm
 	modified:   code/modules/paperwork/clipboard.dm
 	modified:   code/modules/paperwork/contract.dm
 	modified:   code/modules/paperwork/folders.dm
 	modified:   code/modules/paperwork/paper.dm
 	modified:   code/modules/paperwork/paper_cutter.dm
 	modified:   code/modules/paperwork/paperbin.dm
 	modified:   code/modules/paperwork/paperplane.dm
 	modified:   code/modules/paperwork/photocopier.dm
 	modified:   code/modules/paperwork/photography.dm
 	modified:   code/modules/power/apc.dm
 	modified:   code/modules/power/cable.dm
 	modified:   code/modules/power/cell.dm
 	modified:   code/modules/power/gravitygenerator.dm
 	modified:   code/modules/power/lighting.dm
 	modified:   code/modules/power/power.dm
 	modified:   code/modules/power/rtg.dm
 	modified:   code/modules/power/singularity/containment_field.dm
 	modified:   code/modules/power/singularity/field_generator.dm
 	modified:   code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
 	modified:   code/modules/power/singularity/particle_accelerator/particle_control.dm
 	modified:   code/modules/power/singularity/singularity.dm
 	modified:   code/modules/power/smes.dm
 	modified:   code/modules/power/solar.dm
 	modified:   code/modules/power/supermatter/supermatter.dm
 	modified:   code/modules/power/tesla/energy_ball.dm
 	modified:   code/modules/projectiles/gun.dm
 	modified:   code/modules/projectiles/guns/energy/nuclear.dm
 	modified:   code/modules/projectiles/projectile.dm
 	modified:   code/modules/projectiles/projectile/bullets.dm
 	modified:   code/modules/projectiles/projectile/energy.dm
 	modified:   code/modules/reagents/chemistry/holder.dm
 	modified:   code/modules/reagents/chemistry/machinery/chem_dispenser.dm
 	modified:   code/modules/reagents/chemistry/machinery/chem_heater.dm
 	modified:   code/modules/reagents/chemistry/machinery/chem_master.dm
 	modified:   code/modules/reagents/chemistry/machinery/pandemic.dm
 	modified:   code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/blob_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/drink_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/food_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/medicine_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/other_reagents.dm
 	modified:   code/modules/reagents/chemistry/reagents/toxin_reagents.dm
 	modified:   code/modules/reagents/chemistry/recipes/slime_extracts.dm
 	modified:   code/modules/reagents/reagent_containers.dm
 	modified:   code/modules/reagents/reagent_containers/hypospray.dm
 	modified:   code/modules/reagents/reagent_dispenser.dm
 	modified:   code/modules/research/circuitprinter.dm
 	modified:   code/modules/research/designs.dm
 	modified:   code/modules/research/designs/stock_parts_designs.dm
 	modified:   code/modules/research/protolathe.dm
 	modified:   code/modules/research/rdconsole.dm
 	modified:   code/modules/research/rdmachines.dm
 	modified:   code/modules/research/server.dm
 	modified:   code/modules/research/xenobiology/xenobiology.dm
 	modified:   code/modules/ruins/objects_and_mobs/necropolis_gate.dm
 	modified:   code/modules/ruins/objects_and_mobs/sin_ruins.dm
 	modified:   code/modules/shuttle/shuttle.dm
 	modified:   code/modules/shuttle/special.dm
 	modified:   code/modules/shuttle/supply.dm
 	modified:   code/modules/spells/spell.dm
 	modified:   code/modules/spells/spell_types/charge.dm
 	modified:   code/modules/spells/spell_types/ethereal_jaunt.dm
 	modified:   code/modules/spells/spell_types/wizard.dm
 	modified:   code/modules/stock_market/computer.dm
 	modified:   code/modules/surgery/bodyparts/bodyparts.dm
 	modified:   code/modules/surgery/bodyparts/dismemberment.dm
 	modified:   code/modules/surgery/organs/augments_arms.dm
 	modified:   code/modules/surgery/organs/augments_chest.dm
 	modified:   code/modules/surgery/organs/augments_eyes.dm
 	modified:   code/modules/uplink/uplink_item.dm
 	modified:   code/modules/zombie/items.dm
 	modified:   code/modules/zombie/organs.dm
 	modified:   code/world.dm
 	modified:   config/admins.txt
 	modified:   html/changelog.html
 	modified:   html/changelogs/.all_changelog.yml
 	new file:   html/changelogs/AutoChangeLog-pr-20748.yml
 	modified:   icons/mob/hud.dmi
 	modified:   icons/mob/inhands/items_lefthand.dmi
 	modified:   icons/mob/inhands/items_righthand.dmi
 	modified:   icons/mob/talk.dmi
 	modified:   icons/mob/ties.dmi
 	modified:   icons/obj/chemical.dmi
 	modified:   icons/obj/clothing/ties.dmi
 	modified:   icons/obj/objects.dmi
 	modified:   icons/turf/floors.dmi
 	deleted:    icons/turf/floors/warning.dmi
 2016-09-30 20:00:39 -04: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
e43b06f750 Merge pull request #20591 from ChangelingRain/proofofconceptantagdatum 
"Working Datum Antagonists"
 2016-09-29 13:33:59 -05:00
Cheridan
1e92582bdd Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall 
Adds some pronoun helpers
 2016-09-29 12:41:27 -05:00
phil235
4c05d432a1 some fixes. 2016-09-29 15:58:19 +02:00
XDTM
c60b37f7fc exPeriment 2016-09-29 14:55:12 +02:00
XDTM
4bad9aa0bc Abduction Tweaks 2016-09-29 12:54:30 +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
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
Joan Lung
a414d28999 on edge 2016-09-26 17:10:21 -04:00
Joan Lung
29b4c6a8ff like a furious buzzing bee, or some metaphor or something. 2016-09-26 16:50:49 -04:00
Joan Lung
cab5342b47 I think you're thinking of the wrong sort of drugs, Madison. 2016-09-26 14:37:16 -04:00
Cheridan
9e619978f4 Merge pull request #20651 from ChangelingRain/blobwinpercentage 
Adjusted the blobs required for blobs to win in the blob mode
 2016-09-24 18:44:40 -05:00
oranges
c580a790de Merge pull request #20612 from ChangelingRain/orangesisalyingfruit 
Antag spawner items and blob cores now poll candidates instead of grabbing candidates with no poll
 2016-09-24 19:51:02 +12:00
oranges
bfa8f46b90 Merge pull request #20580 from ChangelingRain/lightenlightdrainamount 
Clockcult powerdraining is more likely to cause lights to burn out
 2016-09-24 19:49:38 +12:00
Joan Lung
9d6bebceea Adjusted the blobs required for blobs to win in the blob mode 2016-09-23 16:15:32 -04:00
Incoming5643
31937a45ff Centcom won't ask the station to nuke itself if the blob is dead (#20638) 2016-09-23 13:12:58 -05:00
Joan Lung
bb34bc7d1b checks will remain 2016-09-21 08:41:56 -04:00
Joan Lung
2d66722c1c BYOND'S PROC NAMING ARCANA 2016-09-20 19:56:19 -04:00
Joan Lung
4225926876 Antag spawner items and blob cores now poll candidates instead of grabbing candidates 2016-09-20 19:24:39 -04:00
Joan Lung
d41971d7ed Merge branch 'master' of https://github.com/tgstation/tgstation into proofofconceptantagdatum 
Conflicts:
	code/game/gamemodes/game_mode.dm
 2016-09-20 19:03:20 -04:00
Cheridan
a930355581 Merge pull request #20572 from AnturK/godisdead 
Removes Hand of God gamemode.
 2016-09-20 13:46:52 -05:00
Joan Lung
3c34269258 this is kind of cruel to phil (#20573) 
but phil's nice so I'll stop after this
 2016-09-20 21:48:12 +12:00
Xhuis
ea21aa4e00 Highlander Patch (#20211) 
* Highlander changes

* Prevents losing your claymore F O R E V E R

* Adds partial bloodthirst sating from attacking

* Reworks bloodthirst

* Forgot to push this

* Adds a disk-capture mechanic

* Changes based on feedback

* Bugfixes

* Makes the pinpointer functional
 2016-09-20 21:37:08 +12:00
Joan Lung
5ac7e1b68d cult too! 2016-09-19 19:44:58 -04:00
Joan Lung
1ec364f400 sorting 2016-09-19 17:29:46 -04:00
Razharas
8d7edd4b6d Merge pull request #20567 from ChangelingRain/ifallandgetbackuponthereboundikeepgoingofflikeashotinthedarkwithnothingtoloseandnoreasontodie 
Some cult fixes
 2016-09-19 21:09:15 +03:00
Joan Lung
7e66edb2c3 this is probably a good way to go about dealing with subtypes 2016-09-19 13:34:58 -04:00
Joan Lung
70f5419838 this is a style change 2016-09-19 13:12:46 -04:00