TheCarlSaganExpress
36d6695319
Requested changes to #20637 ( #20701 )
...
* Requests by Phil
* Additional Code
2016-09-28 08:54:42 +02:00
Jordie
5273651be2
Merge pull request #20706 from Cuboos/Vape_Fix_for_real_this_time
...
Vape Fix, no more Admin Spam edition.
2016-09-28 16:50:51 +10:00
TheCarlSaganExpress
36e52cf79b
Added user as an argument
2016-09-27 20:36:17 -04:00
Cyberboss
9b11a70902
Git is hard
2016-09-27 20:16:36 -04: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
TheCarlSaganExpress
3a8c7ecbd7
Update crayons.dm
...
Changed to reagents.total_volume
2016-09-27 19:24:35 -04:00
phil235
7c6c99683d
more mistakes fixed
2016-09-27 23:22:03 +02:00
ExcessiveUseOfCobblestone
f02798d87d
IMMENSE BUFF TO SECURE BRIEFCASES/WALLSAFE ( #20668 )
...
SAY GOODBYE EMAG USERS! THE AGE OF THE MULTITOOL IS UPON US!
In Short: Removes Emag Function [aka Requiring a multitool], and has a lower chance to successfully hack [from 40% to 33%]
It doesn't make sense that something that has no place for an ID can be swiped with an overglorified ID. Git gud and use the multitool. Now when someone puts secure items in the secure safe, people won't laugh at them [i mean they probably still will, but it's ok].
2016-09-28 09:51:53 +13: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
ExcessiveUseOfCobblestone
9d54b28e9b
Fixes Intellicard view-locking bug ( #20682 )
...
* Update ai_core.dm
* Update ai.dm
* Update mecha.dm
* Update mecha.dm
* Update mecha.dm
* Update ai_core.dm
* Update ai.dm
* Update ai_core.dm
* Update ai.dm
* Update ai_core.dm
2016-09-27 13:40:45 +02:00
Cuboos
8bcffdd908
OKAY IT WILL WORK THIS TIME I HOPE OH GOD HELP ME
2016-09-26 21:23:51 -07:00
TheCarlSaganExpress
433305b967
Fixed a runtime error when eating a crayon.
2016-09-26 20:16:58 -04:00
ExcessiveUseOfCobblestone
5ed5566dbf
modified: _maps/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm
...
modified: _maps/RandomZLevels/Academy.dmm
modified: _maps/RandomZLevels/caves.dmm
modified: _maps/RandomZLevels/research.dmm
modified: _maps/map_files/MetaStation/MetaStation.dmm
modified: _maps/map_files/MiniStation/cargopacks.dm
modified: _maps/map_files/TgStation/tgstation.2.1.3.dmm
modified: _maps/map_files/generic/z2.dmm
modified: code/__DEFINES/clothing.dm
modified: code/__DEFINES/flags.dm
modified: code/__DEFINES/hud.dm
modified: code/__DEFINES/is_helpers.dm
modified: code/__DEFINES/layers.dm
modified: code/__DEFINES/machines.dm
modified: code/__DEFINES/misc.dm
modified: code/__DEFINES/role_preferences.dm
modified: code/__DEFINES/say.dm
modified: code/__DEFINES/wires.dm
modified: code/__HELPERS/global_lists.dm
modified: code/__HELPERS/matrices.dm
modified: code/__HELPERS/mobs.dm
modified: code/__HELPERS/type2type.dm
modified: code/__HELPERS/unsorted.dm
modified: code/_globalvars/lists/flavor_misc.dm
modified: code/_onclick/click.dm
modified: code/_onclick/hud/_defines.dm
modified: code/_onclick/hud/alien.dm
modified: code/_onclick/hud/alien_larva.dm
modified: code/_onclick/hud/fullscreen.dm
modified: code/_onclick/hud/hud.dm
modified: code/_onclick/hud/human.dm
modified: code/_onclick/hud/monkey.dm
modified: code/_onclick/hud/other_mobs.dm
modified: code/_onclick/hud/robot.dm
modified: code/_onclick/hud/screen_objects.dm
modified: code/controllers/subsystem/minimap.dm
new file: code/controllers/subsystem/orbit.dm
modified: code/controllers/subsystem/spacedrift.dm
modified: code/controllers/subsystem/ticker.dm
modified: code/datums/diseases/advance/advance.dm
modified: code/datums/diseases/advance/symptoms/damage_converter.dm
modified: code/datums/diseases/advance/symptoms/heal.dm
modified: code/datums/hud.dm
modified: code/datums/mind.dm
modified: code/datums/outfit.dm
modified: code/datums/wires/airalarm.dm
modified: code/datums/wires/airlock.dm
modified: code/datums/wires/apc.dm
modified: code/datums/wires/autolathe.dm
modified: code/datums/wires/explosive.dm
modified: code/datums/wires/particle_accelerator.dm
modified: code/datums/wires/radio.dm
modified: code/datums/wires/suit_storage_unit.dm
modified: code/datums/wires/vending.dm
modified: code/datums/wires/wires.dm
modified: code/game/area/Space_Station_13_areas.dm
modified: code/game/area/areas.dm
modified: code/game/atoms_movable.dm
modified: code/game/data_huds.dm
modified: code/game/gamemodes/antag_spawner.dm
modified: code/game/gamemodes/blob/blob.dm
modified: code/game/gamemodes/blob/blobs/core.dm
modified: code/game/gamemodes/clock_cult/clock_items.dm
modified: code/game/gamemodes/clock_cult/clock_machines.dm
modified: code/game/gamemodes/clock_cult/clock_mobs.dm
new file: code/game/gamemodes/clock_cult/clock_powerdrain.dm
modified: code/game/gamemodes/clock_cult/clock_scripture.dm
modified: code/game/gamemodes/clock_cult/clock_structures.dm
modified: code/game/gamemodes/cult/ritual.dm
modified: code/game/gamemodes/cult/runes.dm
modified: code/game/gamemodes/cult/talisman.dm
modified: code/game/gamemodes/game_mode.dm
deleted: code/game/gamemodes/handofgod/_handofgod.dm
deleted: code/game/gamemodes/handofgod/actions.dm
deleted: code/game/gamemodes/handofgod/god.dm
deleted: code/game/gamemodes/handofgod/objectives.dm
deleted: code/game/gamemodes/handofgod/powers.dm
deleted: code/game/gamemodes/handofgod/structures.dm
modified: code/game/gamemodes/miniantags/abduction/abduction_gear.dm
modified: code/game/gamemodes/miniantags/revenant/revenant_blight.dm
modified: code/game/gamemodes/miniantags/slaughter/slaughter.dm
modified: code/game/gamemodes/nuclear/nuclearbomb.dm
modified: code/game/gamemodes/wizard/soulstone.dm
modified: code/game/machinery/computer/computer.dm
modified: code/game/machinery/doors/windowdoor.dm
new file: code/game/machinery/limbgrower.dm
modified: code/game/machinery/machinery.dm
modified: code/game/machinery/recharger.dm
modified: code/game/machinery/syndicatebomb.dm
modified: code/game/machinery/vending.dm
modified: code/game/mecha/mecha_defense.dm
modified: code/game/mecha/working/ripley.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/decals/crayon.dm
modified: code/game/objects/effects/effect_system/effects_smoke.dm
modified: code/game/objects/effects/overlays.dm
modified: code/game/objects/effects/step_triggers.dm
modified: code/game/objects/items.dm
modified: code/game/objects/items/blueprints.dm
modified: code/game/objects/items/devices/PDA/PDA.dm
modified: code/game/objects/items/devices/chameleonproj.dm
modified: code/game/objects/items/devices/megaphone.dm
renamed: code/game/gamemodes/handofgod/items.dm -> code/game/objects/items/religion.dm
modified: code/game/objects/items/robot/robot_items.dm
modified: code/game/objects/items/stacks/stack.dm
modified: code/game/objects/items/weapons/cigs_lighters.dm
modified: code/game/objects/items/weapons/grenades/grenade.dm
modified: code/game/objects/items/weapons/grenades/spawnergrenade.dm
modified: code/game/objects/items/weapons/implants/implant_loyality.dm
modified: code/game/objects/items/weapons/kitchen.dm
modified: code/game/objects/items/weapons/melee/energy.dm
modified: code/game/objects/items/weapons/melee/misc.dm
modified: code/game/objects/items/weapons/mop.dm
modified: code/game/objects/items/weapons/storage/belt.dm
modified: code/game/objects/items/weapons/storage/uplink_kits.dm
modified: code/game/objects/items/weapons/tools.dm
modified: code/game/objects/items/weapons/vending_items.dm
modified: code/game/objects/items/weapons/weaponry.dm
modified: code/game/objects/objs.dm
modified: code/game/objects/structures/crates_lockers/closets/fitness.dm
new file: code/game/objects/structures/divine.dm
modified: code/game/objects/structures/flora.dm
modified: code/game/objects/structures/fluff.dm
modified: code/game/objects/structures/grille.dm
modified: code/game/objects/structures/kitchen_spike.dm
modified: code/game/objects/structures/tables_racks.dm
renamed: code/game/gamemodes/handofgod/traps.dm -> code/game/objects/structures/traps.dm
modified: code/game/objects/structures/window.dm
modified: code/game/turfs/simulated/dirtystation.dm
modified: code/game/turfs/simulated/floor/fancy_floor.dm
modified: code/game/turfs/simulated/floor/light_floor.dm
modified: code/game/turfs/simulated/floor/misc_floor.dm
modified: code/game/turfs/simulated/floor/plating.dm
modified: code/game/turfs/turf.dm
modified: code/modules/admin/player_panel.dm
modified: code/modules/admin/verbs/onlyone.dm
modified: code/modules/admin/verbs/pray.dm
modified: code/modules/assembly/flash.dm
modified: code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
modified: code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
modified: code/modules/awaymissions/capture_the_flag.dm
modified: code/modules/cargo/packs.dm
modified: code/modules/client/client_colour.dm
modified: code/modules/client/preferences.dm
modified: code/modules/client/preferences_savefile.dm
modified: code/modules/clothing/clothing.dm
modified: code/modules/clothing/glasses/glasses.dm
modified: code/modules/clothing/glasses/hud.dm
modified: code/modules/clothing/spacesuits/hardsuit.dm
modified: code/modules/clothing/suits/miscellaneous.dm
modified: code/modules/clothing/suits/wiz_robe.dm
modified: code/modules/clothing/under/jobs/civilian.dm
modified: code/modules/clothing/under/shorts.dm
modified: code/modules/events/holiday/halloween.dm
modified: code/modules/events/shuttle_loan.dm
modified: code/modules/food_and_drinks/food/snacks/meat.dm
modified: code/modules/food_and_drinks/food/snacks_burgers.dm
modified: code/modules/food_and_drinks/food/snacks_other.dm
modified: code/modules/food_and_drinks/kitchen_machinery/processor.dm
modified: code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
modified: code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
modified: code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
modified: code/modules/holodeck/areas.dm
modified: code/modules/holodeck/turfs.dm
modified: code/modules/jobs/job_types/cargo_service.dm
modified: code/modules/mining/abandoned_crates.dm
modified: code/modules/mining/lavaland/necropolis_chests.dm
modified: code/modules/mining/machine_vending.dm
modified: code/modules/mining/mine_areas.dm
modified: code/modules/mining/mine_turfs.dm
modified: code/modules/mob/dead/observer/observer.dm
modified: code/modules/mob/inventory.dm
modified: code/modules/mob/living/carbon/alien/larva/life.dm
modified: code/modules/mob/living/carbon/carbon.dm
modified: code/modules/mob/living/carbon/carbon_defense.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/life.dm
modified: code/modules/mob/living/carbon/human/species.dm
modified: code/modules/mob/living/carbon/human/species_types.dm
modified: code/modules/mob/living/carbon/human/update_icons.dm
modified: code/modules/mob/living/carbon/inventory.dm
modified: code/modules/mob/living/carbon/life.dm
modified: code/modules/mob/living/carbon/monkey/punpun.dm
modified: code/modules/mob/living/carbon/say.dm
modified: code/modules/mob/living/carbon/update_icons.dm
modified: code/modules/mob/living/death.dm
modified: code/modules/mob/living/life.dm
modified: code/modules/mob/living/living.dm
modified: code/modules/mob/living/say.dm
modified: code/modules/mob/living/silicon/ai/life.dm
modified: code/modules/mob/living/silicon/login.dm
modified: code/modules/mob/living/silicon/pai/life.dm
modified: code/modules/mob/living/silicon/robot/login.dm
modified: code/modules/mob/living/silicon/robot/robot.dm
modified: code/modules/mob/living/silicon/robot/robot_modules.dm
modified: code/modules/mob/living/simple_animal/friendly/cockroach.dm
modified: code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
modified: code/modules/mob/living/simple_animal/hostile/hostile.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/dragon.dm
modified: code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
modified: code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
modified: code/modules/mob/living/simple_animal/hostile/skeleton.dm
modified: code/modules/mob/living/simple_animal/simple_animal.dm
modified: code/modules/mob/mob.dm
modified: code/modules/mob/mob_helpers.dm
modified: code/modules/mob/new_player/new_player.dm
modified: code/modules/mob/new_player/sprite_accessories.dm
modified: code/modules/mob/transform_procs.dm
modified: code/modules/modular_computers/computers/item/computer.dm
modified: code/modules/modular_computers/computers/item/computer_components.dm
modified: code/modules/modular_computers/computers/item/computer_damage.dm
modified: code/modules/modular_computers/computers/item/computer_power.dm
modified: code/modules/modular_computers/computers/item/computer_ui.dm
modified: code/modules/modular_computers/computers/item/processor.dm
modified: code/modules/modular_computers/computers/item/tablet.dm
modified: code/modules/modular_computers/computers/machinery/console_presets.dm
modified: code/modules/modular_computers/computers/machinery/modular_computer.dm
modified: code/modules/modular_computers/computers/machinery/modular_console.dm
deleted: code/modules/modular_computers/documentation.dm
new file: code/modules/modular_computers/documentation.md
modified: code/modules/modular_computers/file_system/program.dm
modified: code/modules/modular_computers/file_system/programs/antagonist/dos.dm
modified: code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
modified: code/modules/modular_computers/file_system/programs/card.dm
modified: code/modules/modular_computers/file_system/programs/configurator.dm
modified: code/modules/modular_computers/file_system/programs/file_browser.dm
modified: code/modules/modular_computers/file_system/programs/ntdownloader.dm
modified: code/modules/modular_computers/file_system/programs/ntnrc_client.dm
modified: code/modules/modular_computers/file_system/programs/nttransfer.dm
modified: code/modules/modular_computers/hardware/CPU.dm
modified: code/modules/modular_computers/hardware/_hardware.dm
modified: code/modules/modular_computers/hardware/battery_module.dm
modified: code/modules/modular_computers/hardware/card_slot.dm
modified: code/modules/modular_computers/hardware/hard_drive.dm
modified: code/modules/modular_computers/hardware/network_card.dm
modified: code/modules/modular_computers/hardware/portable_disk.dm
modified: code/modules/modular_computers/hardware/printer.dm
modified: code/modules/modular_computers/hardware/recharger.dm
modified: code/modules/modular_computers/laptop_vendor.dm
new file: code/modules/orbit/orbit.dm
modified: code/modules/power/lighting.dm
modified: code/modules/power/supermatter/supermatter.dm
modified: code/modules/power/tesla/coil.dm
modified: code/modules/power/tesla/energy_ball.dm
modified: code/modules/projectiles/ammunition.dm
modified: code/modules/projectiles/ammunition/ammo_casings.dm
modified: code/modules/projectiles/ammunition/energy.dm
modified: code/modules/projectiles/ammunition/special.dm
modified: code/modules/projectiles/firing.dm
modified: code/modules/projectiles/guns/energy/kinetic_accelerator.dm
modified: code/modules/projectiles/guns/energy/stun.dm
modified: code/modules/projectiles/projectile.dm
modified: code/modules/projectiles/projectile/beams.dm
modified: code/modules/projectiles/projectile/bullets.dm
modified: code/modules/projectiles/projectile/energy.dm
modified: code/modules/projectiles/projectile/reusable.dm
modified: code/modules/projectiles/projectile/special.dm
modified: code/modules/reagents/chemistry/machinery/pandemic.dm
modified: code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
modified: code/modules/reagents/chemistry/reagents/drink_reagents.dm
modified: code/modules/reagents/chemistry/reagents/other_reagents.dm
modified: code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
modified: code/modules/reagents/chemistry/reagents/toxin_reagents.dm
modified: code/modules/reagents/chemistry/recipes.dm
modified: code/modules/reagents/chemistry/recipes/pyrotechnics.dm
modified: code/modules/reagents/chemistry/recipes/toxins.dm
modified: code/modules/reagents/reagent_containers/glass.dm
new file: code/modules/research/designs/limbgrower_designs.dm
modified: code/modules/research/designs/weapon_designs.dm
modified: code/modules/research/research.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/bodyparts/helpers.dm
modified: code/modules/surgery/organs/augments_arms.dm
modified: code/modules/surgery/organs/augments_chest.dm
modified: code/modules/surgery/organs/organ_internal.dm
modified: config/tips.txt
modified: html/changelog.html
modified: html/changelogs/.all_changelog.yml
deleted: html/changelogs/AutoChangeLog-pr-20404.yml
deleted: html/changelogs/AutoChangeLog-pr-20419.yml
deleted: html/changelogs/AutoChangeLog-pr-20447.yml
deleted: html/changelogs/AutoChangeLog-pr-20467.yml
deleted: html/changelogs/AutoChangeLog-pr-20479.yml
modified: icons/effects/blood.dmi
new file: icons/effects/bubblegum.dmi
modified: icons/effects/effects.dmi
modified: icons/mob/hud.dmi
modified: icons/mob/human_parts_greyscale.dmi
modified: icons/mob/inhands/items_lefthand.dmi
modified: icons/mob/inhands/items_righthand.dmi
modified: icons/mob/mask.dmi
modified: icons/mob/mutant_bodyparts.dmi
modified: icons/mob/screen_gen.dmi
modified: icons/mob/screen_midnight.dmi
modified: icons/mob/screen_operative.dmi
modified: icons/mob/screen_plasmafire.dmi
modified: icons/mob/screen_retro.dmi
modified: icons/mob/screen_slimecore.dmi
modified: icons/mob/suit.dmi
modified: icons/mob/uniform.dmi
modified: icons/obj/clothing/glasses.dmi
modified: icons/obj/clothing/masks.dmi
modified: icons/obj/clothing/suits.dmi
modified: icons/obj/food/burgerbread.dmi
modified: icons/obj/food/food.dmi
new file: icons/obj/machines/limbgrower.dmi
modified: icons/obj/modular_tablet.dmi
modified: icons/obj/projectiles.dmi
modified: icons/obj/weapons.dmi
modified: interface/skin.dmf
new file: sound/effects/pop_expl.ogg
2016-09-26 12:40:26 -04:00
oranges
5581fd9c72
Fix simple mobs spawning into nullspace + helper for spawning atoms ( #20669 )
...
Fixes badminbomb cores and spawner grenades starting out mobs in
nullspace, also adds a helper proc to do spawning
2016-09-26 08:47:03 +02:00
TheCarlSaganExpress
7e1331bc04
PDA Adjustments ( #20637 )
...
* Adjustments to the PDA. Ejecting a cartridge from the PDA no longer falls to the ground.
* Requested Changes
2016-09-26 14:57:30 +13:00
Cuboos
385d75a20a
Vapes are coming to SS13 ( #20629 )
...
Bringing the Vape Nation to Space Station 13! Adds new E-cigarettes (other wise known as vapes) to the Cigarette vending machines as contraband. You fill them with reagents instead of dried plants. You can modify them by opening them with a screw driver and increasing the voltage with a Multitool. This creates a small smoke puff with what ever reagent is inside, it also uses reagents faster. You can also maximize the voltage using an emag, which will fill the room with reagent smoke and point you out as a filthy traitor -- useful to spreading meds to an entire room (or poison). Has a 15 percent chance to explode while in use after being emagged, which stuns for a few minutes and deals some burn damage to the mob's head. Will explode and gib you if filled with plasma or will light you on fire if filled with welding fuel.
Fun uses
Fill with Leporazine and Salbutamol for ghetto EVA
Fill with Omnizine for constant healing
Fill with meth and be a pain in the ass for security.
Fill with mannitol as a quick way to cure brain damage
Fill with Synaptizine and never be bothered by BZ or hallucination sting ever again.
Fill with Bath Salts and never get stunned again (also die)
Fill with welding fuel and leave it around for some poor assistant to find.
Fill with plasma and put it in the mouth of your assassination target (be sure to run)
Emag and fill with virus culture, spread nurgle's plague.
Mutli-tool it and be a tool your self.
Added a new explosion sound, a small "pop" bang. Intended for when the vape blows up after being emagged, may also be useful for other things, feel free to use (preview https://dl.dropboxusercontent.com/u/9654207/pop_expl.ogg )
Added a Vape Naysh shirt as contraband to the clothing vendor. Look like the tool that you are.
2016-09-25 20:21:59 +13:00
oranges
04a42ee479
Merge pull request #20647 from KorPhaeron/bossofthisgym
...
Boss of this Fitness Room
2016-09-25 12:31:33 +13:00
oranges
a39beaa227
Refactor the experimental welding tool slightly ( #20646 )
2016-09-24 16:49:35 -05:00
Joan Lung
3b5bd1b5ba
Merge pull request #20640 from PKPenguin321/techno-why
...
makes saber sheath examine fancier
2016-09-24 16:14:54 -04:00
kevinz000
a50c6a2c6f
Grills now properly tesla bolt when things are tossed at them ( #20634 )
...
* tesla_grills
* balance
2016-09-24 19:54:12 +12:00
Joan Lung
60e6ebaef1
Bubblegum's blood from being hit now has a different visual ( #20626 )
...
* Bubblegum's blood from being hit now has a different visual
* joan lung confirmed wild shitcoder
2016-09-24 19:51:42 +12:00
KorPhaeron
692f809e28
Boss of this Gym
2016-09-22 21:32:08 -05:00
PKPenguin321
425a09f226
makes saber sheath examine fancier
2016-09-22 15:47:53 -07:00
TechnoAlchemist
a93bfc39e0
Officer's Sabre Tweaks ( #20565 )
...
Allows for quickdrawing the sabre.
Also changes the attack text since it's no longer a rapier, and it doesn't make sense that it can dismember with point lunges and thrusts.
2016-09-23 10:25:25 +12:00
Cyberboss
96087dcf67
Station Blueprints now contain wire legend ( #20559 )
...
Added a submenu to the Station Blueprints that lists wire color purposes for the round for NT made items
Does not list duds
Removed WIRE_ELECTRIFY as it was synonymous with WIRE_SHOCK
2016-09-23 10:24:57 +12:00
AnturK
11c149abbf
Merge pull request #20600 from Ergovisavi/hurr_durr
...
Minor anomalous crystal fixes
2016-09-21 12:41:41 +02: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
AnturK
14886c1bac
fixup
2016-09-20 18:52:31 +02:00
AnturK
6700f30012
Repathes structures to fluff, traps to their own path
2016-09-20 17:36:27 +02:00
yackemflam
5d2255e0e5
Syndicate Ninja ( #20520 )
...
* Syndicate Ninja
* Update uplink_kits.dm
2016-09-20 21:47:24 +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
kevinz000
8a83df0d3b
Arm Combat Cybernetic Implants (because toolset arm shanks weren't enough) ( #20544 )
...
* combat_cybernetics
* flashlight-arms
* surgery
* thiswillprobablyfixit...
* nopethatdoesntwork
* revert
* nerf
* prayingtornjesusitcompiles
2016-09-20 21:36:11 +12:00
Ergovisavi
72f9b60190
Fixes some issues with anomalous crystals
2016-09-19 20:30:38 -07:00
Hamzah
9496e1631a
Limb grower ( #20501 )
...
Added a Experimental Limb Grower to the medbay department, now medical stuff can grow synthetic limbs using Synthflesh to help crew that suffer any work related accidents.
2016-09-20 14:53:43 +12:00
Joan Lung
64667136d5
heavyweight class
...
this is ~eh, but it's this or Another Antag Removal Proc and, god, let's not.
2016-09-19 13:18:51 -04:00
Joan Lung
3ec7e81131
"A Working Datum Antagonist"
2016-09-19 13:03:22 -04:00
Cheridan
8c8e072224
Merge pull request #20569 from feemjmeem/disassemble-meatspikes
...
allow meatspike frames to be welded apart
2016-09-19 10:22:15 -05:00
Joan Lung
ba6acc2ea0
Reduces the copypaste in cleanable decal code ( #20491 )
...
* Only holy water will clean blood runes
* macro!
* holy no longer required
* i am far too unethical and spite driven half the time
* it appears code done in the middle of the night in the hope that oranges hasn't merged my pr isn't always that good
2016-09-19 09:45:12 +12:00
AnturK
faa033c5f3
Fixes coordinates in grenade admin message ( #20576 )
2016-09-18 15:26:15 -05:00
erwgd
a68a0a912b
bone dagger now contains no materials ( #20575 )
2016-09-18 15:25:14 -05:00
Joan Lung
4e534fb030
Merge pull request #20525 from optimumtact/dropdelloops
...
Prevent infinite loops with DROPDEL items and del_on_death simple mobs
2016-09-18 15:51:49 -04:00
AnturK
93f444fd38
Removes Hand of God gamemode.
2016-09-18 13:32:26 +02:00
Marc R. Uchniat
dc1287a176
allow kitchen spikes to be welded apart
2016-09-17 22:42:27 -04:00
phil235
8e8061e851
Wearing colored glasses colors your vision, if you want to. ( #20499 )
...
* Adds semi-transparent colored fullscreen overlays which are used by glasses with tint_color.
Currently only red, blue, and green are available. And only nightvision glasses currently have a tint_color when worn (green).
* Completely rewrites how I did color tinting. We now use datum/client_colour and the client's color var.
I fixed items in our inventory UI being colored when using client.color.
I added an altclick() option on all glasses to toggle a new pref regarding the use of glass coloring your view.
I made a lot more glasses use vision coloring.
I fixed Thermal HUD Scanner not having its action button to switch hud type.
2016-09-17 16:28:50 +12:00
Joan Lung
8f4d2cf7a6
Merge pull request #20531 from Ergovisavi/crystal_tweaks_twerks
...
Tweaks for Readability/Usability/Buffs for the anomalous crystal
2016-09-16 21:47:12 -04:00
Ergovisavi
ad575ce0bc
Tweaks and usability for the anomalous crystal, as well as buffs for a few
2016-09-15 21:08:00 -07:00
Cheridan
b81b27a9d5
Merge pull request #20508 from phil235/GunVisualEffects
...
Adds some visual effects when ammo casings are fired and when projectiles hit things
2016-09-15 19:27:04 -05:00
phil235
26120b01c5
Some requested adjustments
2016-09-15 19:03:24 +02:00
