Ccomp5950
7db352fcc6
Merge pull request #6075 from MrSnapwalk/ertv3
...
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -05:00
PsiOmega
f9df93fad0
Expands the use of the new announcement system.
...
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
MrSnapwalk
9b464d268c
ERT update 3: electric boogaloo.
2014-08-19 21:46:27 -05:00
Jeremy Liberman
d23340a49b
Mutiny Mode
2014-05-11 15:03:50 -05:00
Erthilo
5437b1bbac
Added two ears back.
2013-08-27 22:05:27 +01:00
Zuhayr
221324d29b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 00:25:53 -07:00
Segrain
170c66ee8a
Fix for ERT spawning.
2013-08-06 01:30:49 +03:00
NicholasDV
8da16aac47
Made admins able to override the 'can_call_ert' via force...
...
And removed a few // DEC I put in for being able to easily hop in the code.
2013-08-03 05:23:44 -04:00
NicholasDV
3e364635b2
Separated ERT from red alert and other small changes...
...
Separated the ERT to be callable via the keycard auth device.
Gave the ERT call different messages to work with the above, as well as a message when it has been denied.
The old base amount of 50 was way too stronk. Furthermore, it was added to by other factors from the game. It has been lowered a bit and a proc added in to increase it the longer the round has been going on.
Made it so that you may only attempt to call the ERT a single time.
Changed it so that you only have 5 minutes to join the ERT after it has been called.
2013-08-03 05:13:28 -04:00
Segrain
8021250804
Type mismatch fix.
2013-07-31 10:32:19 +03:00
Segrain
bd6c5f4b30
Removing internal cameras again.
2013-07-31 05:43:23 +03:00
meyar
1498c5748e
Camera's got lost in the shuffle.
2013-07-29 04:34:28 -04:00
meyar
de0c032486
Turns two ERT files into one. Also fixes the ERT admin button being bork.
2013-07-29 03:45:49 -04:00
Spamcat
d0236394ef
Client, mind, big difference...
2013-07-01 20:02:42 +04:00
Spamcat
2b348eaa3e
Phasing out world loops, pt 1
2013-06-20 17:21:16 +04:00
Zuhayr
91008c4d38
Amending a previous fix due to new ERT code from bef.
2013-06-12 20:47:04 -07:00
Zuhayr
fa79834e1b
Merge resolution.
2013-06-12 20:31:29 -07:00
Zuhayr
6bd685bcb2
Compilation fix for ERT code.
2013-06-12 12:30:28 -07:00
meyar
1203a32bbe
Typo fix
2013-06-11 16:58:13 -04:00
meyar
f03f8c9b66
Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c
2013-06-11 15:25:59 -04:00
meyar
5e4b9ae917
Fixes autonomous ERT
2013-06-09 01:02:48 -04:00
Cael_Aislinn
c314b5f42b
Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12
...
Conflicts:
README.txt
SQL/tgstation_schema.sql
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/pipes.dm
code/FEA/FEA_airgroup.dm
code/FEA/FEA_fire.dm
code/FEA/FEA_gas_mixture.dm
code/FEA/FEA_turf_tile.dm
code/TriDimension/Pipes.dm
code/WorkInProgress/buildmode.dm
code/WorkInProgress/organs/organs.dm
code/WorkInProgress/virus2/Disease2/analyser.dm
code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm
code/WorkInProgress/virus2/Disease2/cureimplanter.dm
code/WorkInProgress/virus2/Disease2/diseasesplicer.dm
code/WorkInProgress/virus2/Disease2/dishincubator.dm
code/WorkInProgress/virus2/Disease2/isolator.dm
code/WorkInProgress/virus2/Disease2/monkeydispensor.dm
code/WorkInProgress/virus2/analyser.dm
code/WorkInProgress/virus2/antibodies.dm
code/WorkInProgress/virus2/base.dm
code/WorkInProgress/virus2/biohazard destroyer.dm
code/WorkInProgress/virus2/cureimplanter.dm
code/WorkInProgress/virus2/curer.dm
code/WorkInProgress/virus2/diseasesplicer.dm
code/WorkInProgress/virus2/dishincubator.dm
code/WorkInProgress/virus2/isolator.dm
code/WorkInProgress/virus2/monkeydispensor.dm
code/datums/ai_laws.dm
code/datums/configuration.dm
code/datums/datumvars.dm
code/datums/diseases/alien_embryo.dm
code/datums/diseases/appendicitis.dm
code/datums/diseases/robotic_transformation.dm
code/datums/diseases/xeno_transformation.dm
code/datums/helper_datums/getrev.dm
code/datums/helper_datums/teleport.dm
code/datums/helper_datums/tension.dm
code/datums/mind.dm
code/datums/mixed.dm
code/datums/shuttle_controller.dm
code/datums/spell.dm
code/datums/spells/ethereal_jaunt.dm
code/datums/spells/genetic.dm
code/datums/spells/wizard.dm
code/defines/area/Space Station 13 areas.dm
code/defines/atom.dm
code/defines/global.dm
code/defines/mob/dead/observer.dm
code/defines/mob/living/carbon/alien.dm
code/defines/mob/living/carbon/alien_humanoid.dm
code/defines/mob/living/carbon/carbon.dm
code/defines/mob/living/carbon/metroid.dm
code/defines/mob/living/carbon/monkey.dm
code/defines/mob/living/living.dm
code/defines/mob/living/silicon/ai.dm
code/defines/mob/living/silicon/robot.dm
code/defines/obj.dm
code/defines/obj/closet.dm
code/defines/obj/clothing.dm
code/defines/obj/clothing/costume.dm
code/defines/obj/computer.dm
code/defines/obj/costume.dm
code/defines/obj/decal.dm
code/defines/obj/door.dm
code/defines/obj/hydro.dm
code/defines/obj/machinery.dm
code/defines/obj/storage.dm
code/defines/obj/supplypacks.dm
code/defines/obj/toy.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/AStar.dm
code/defines/procs/command_name.dm
code/defines/procs/dbcore.dm
code/defines/procs/forum_activation.dm
code/defines/procs/gamehelpers.dm
code/defines/procs/helpers.dm
code/defines/procs/icon_procs.dm
code/defines/procs/station_name.dm
code/defines/procs/statistics.dm
code/defines/turf.dm
code/game/algorithm.dm
code/game/area/areas.dm
code/game/asteroid/artifacts.dm
code/game/atom_procs.dm
code/game/cellautomata.dm
code/game/dna.dm
code/game/events/EventProcs/clang.dm
code/game/events/EventProcs/dust.dm
code/game/events/EventProcs/ninja_abilities.dm
code/game/events/EventProcs/ninja_equipment.dm
code/game/events/EventProcs/space_ninja.dm
code/game/events/EventProcs/spacevines.dm
code/game/gamemodes/blob/blob.dm
code/game/gamemodes/blob/blob_finish.dm
code/game/gamemodes/blob/blob_report.dm
code/game/gamemodes/blob/theblob.dm
code/game/gamemodes/changeling/changeling.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/changeling/traitor_chan.dm
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/cult/cult_items.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/gamemodes/malfunction/malfunction.dm
code/game/gamemodes/meteor/meteor.dm
code/game/gamemodes/meteor/meteors.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/gamemodes/nuclear/pinpointer.dm
code/game/gamemodes/objective.dm
code/game/gamemodes/revolution/revolution.dm
code/game/gamemodes/sandbox/h_sandbox.dm
code/game/gamemodes/sandbox/sandbox.dm
code/game/gamemodes/setupgame.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/gamemodes/wizard/soulstone.dm
code/game/gamemodes/wizard/spellbook.dm
code/game/gamemodes/wizard/spells.dm
code/game/gamemodes/wizard/veilrender.dm
code/game/gamemodes/wizard/wizard.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/civilian_chaplain.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job/silicon.dm
code/game/jobs/job_controller.dm
code/game/jobs/jobs.dm
code/game/machinery/Beacon.dm
code/game/machinery/OpTable.dm
code/game/machinery/Sleeper.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/autolathe.dm
code/game/machinery/biogenerator.dm
code/game/machinery/bots/bots.dm
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/mulebot.dm
code/game/machinery/camera.dm
code/game/machinery/cell_charger.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/Operating.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/arcade.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/buildandrepair.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/communications.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/crew.dm
code/game/machinery/computer/hologram.dm
code/game/machinery/computer/law.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/power.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/robot.dm
code/game/machinery/computer/security.dm
code/game/machinery/computer/shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/deployable.dm
code/game/machinery/door_control.dm
code/game/machinery/doors/airlock.dm
code/game/machinery/doors/airlock_electronics.dm
code/game/machinery/doors/brigdoors.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/doors/poddoor.dm
code/game/machinery/doors/unpowered.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/flasher.dm
code/game/machinery/gateway.dm
code/game/machinery/hologram.dm
code/game/machinery/hydroponics.dm
code/game/machinery/kitchen/gibber.dm
code/game/machinery/morgue.dm
code/game/machinery/newscaster.dm
code/game/machinery/pipe/construction.dm
code/game/machinery/pipe/pipe_dispenser.dm
code/game/machinery/portable_turret.dm
code/game/machinery/recharger.dm
code/game/machinery/rechargestation.dm
code/game/machinery/requests_console.dm
code/game/machinery/shieldgen.dm
code/game/machinery/spaceheater.dm
code/game/machinery/suit_storage_unit.dm
code/game/machinery/syndicatebeacon.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/teleporter.dm
code/game/machinery/turrets.dm
code/game/machinery/vending.dm
code/game/magic/cultist/ritual.dm
code/game/magic/cultist/runes.dm
code/game/magic/library.dm
code/game/magic/musician.dm
code/game/master_controller.dm
code/game/mecha/combat/combat.dm
code/game/mecha/combat/gygax.dm
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_construction_paths.dm
code/game/mecha/mecha_wreckage.dm
code/game/mecha/medical/medical.dm
code/game/mecha/medical/odysseus.dm
code/game/mecha/working/ripley.dm
code/game/objects/alien/facehugger.dm
code/game/objects/alien/resin.dm
code/game/objects/bodybag.dm
code/game/objects/closets.dm
code/game/objects/closets/emergency.dm
code/game/objects/closets/extinguisher.dm
code/game/objects/closets/fireaxe.dm
code/game/objects/closets/firecloset.dm
code/game/objects/closets/fitnesscloset.dm
code/game/objects/closets/janitor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/closets/nuclear.dm
code/game/objects/closets/secure/bar.dm
code/game/objects/closets/secure/cargo.dm
code/game/objects/closets/secure/engineering.dm
code/game/objects/closets/secure/hydroponics.dm
code/game/objects/closets/secure/medical.dm
code/game/objects/closets/secure/personal.dm
code/game/objects/closets/secure/scientist.dm
code/game/objects/closets/secure/secure_closets.dm
code/game/objects/closets/secure/security.dm
code/game/objects/closets/syndicate.dm
code/game/objects/closets/wardrobe.dm
code/game/objects/contraband.dm
code/game/objects/crates.dm
code/game/objects/devices/PDA/PDA.dm
code/game/objects/devices/PDA/cart.dm
code/game/objects/devices/PDA/chatroom.dm
code/game/objects/devices/aicard.dm
code/game/objects/devices/flash.dm
code/game/objects/devices/flashlight.dm
code/game/objects/devices/paicard.dm
code/game/objects/devices/scanners.dm
code/game/objects/devices/taperecorder.dm
code/game/objects/devices/traitordevices.dm
code/game/objects/door_assembly.dm
code/game/objects/effect_system.dm
code/game/objects/electricchair.dm
code/game/objects/explosion.dm
code/game/objects/gibs.dm
code/game/objects/grille.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/candle.dm
code/game/objects/items/clothing.dm
code/game/objects/items/food.dm
code/game/objects/items/helper_procs.dm
code/game/objects/items/item.dm
code/game/objects/items/robot_items.dm
code/game/objects/items/robot_parts.dm
code/game/objects/items/tk_grab.dm
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/RSF.dm
code/game/objects/items/weapons/cameras.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/dna_injector.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/grenades.dm
code/game/objects/items/weapons/hand_lablers.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/implants/implant.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/implants/implantchair.dm
code/game/objects/items/weapons/implants/implanter.dm
code/game/objects/items/weapons/implants/implantfreedom.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/implants/implantpad.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/medical.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/game/objects/items/weapons/papers_bins.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/swords_axes_etc.dm
code/game/objects/items/weapons/table_rack_parts.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/items/weapons/wrappingpaper.dm
code/game/objects/mineral_doors.dm
code/game/objects/radio/beacon.dm
code/game/objects/radio/electropack.dm
code/game/objects/radio/encryptionkey.dm
code/game/objects/radio/headset.dm
code/game/objects/radio/intercom.dm
code/game/objects/radio/radio.dm
code/game/objects/secstorage/sbriefcase.dm
code/game/objects/secstorage/ssafe.dm
code/game/objects/stacks/glass.dm
code/game/objects/stacks/metal.dm
code/game/objects/stacks/stack.dm
code/game/objects/stacks/wood.dm
code/game/objects/stool.dm
code/game/objects/storage/backpack.dm
code/game/objects/storage/belt.dm
code/game/objects/storage/bible.dm
code/game/objects/storage/briefcase.dm
code/game/objects/storage/lockbox.dm
code/game/objects/storage/storage.dm
code/game/objects/storage/uplink_kits.dm
code/game/objects/structures.dm
code/game/objects/tables_racks.dm
code/game/objects/tank.dm
code/game/objects/tanks/emergency.dm
code/game/objects/tanks/jetpack.dm
code/game/objects/toys.dm
code/game/objects/transfer_valve.dm
code/game/objects/uplinks.dm
code/game/objects/watercloset.dm
code/game/objects/weapons.dm
code/game/objects/windoor_assembly.dm
code/game/objects/window.dm
code/game/prisonshuttle.dm
code/game/smoothwall.dm
code/game/sound.dm
code/game/step_triggers.dm
code/game/structure/structure.dm
code/game/supplyshuttle.dm
code/game/throwing.dm
code/game/topic.dm
code/game/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/airtight/land.dm
code/game/vehicles/airtight/space.dm
code/game/vehicles/vehicle.dm
code/game/verbs/ooc.dm
code/game/verbs/sound.dm
code/game/verbs/suicide.dm
code/game/verbs/who.dm
code/game/vote.dm
code/modules/admin/IsBanned.dm
code/modules/admin/NewBan.dm
code/modules/admin/admin.dm
code/modules/admin/admin_investigate.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/banjob.dm
code/modules/admin/create_mob.dm
code/modules/admin/create_object.dm
code/modules/admin/create_turf.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/MC.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminjump.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/atmosdebug.dm
code/modules/admin/verbs/cinematic.dm
code/modules/admin/verbs/deadsay.dm
code/modules/admin/verbs/debug.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/admin/verbs/mapping.dm
code/modules/admin/verbs/massmodvar.dm
code/modules/admin/verbs/modifyvariables.dm
code/modules/admin/verbs/onlyone.dm
code/modules/admin/verbs/playsound.dm
code/modules/admin/verbs/possess.dm
code/modules/admin/verbs/pray.dm
code/modules/admin/verbs/randomverbs.dm
code/modules/admin/verbs/striketeam.dm
code/modules/admin/verbs/striketeam_syndicate.dm
code/modules/assembly/assembly.dm
code/modules/assembly/signaler.dm
code/modules/chemical/Chemistry-Machinery.dm
code/modules/chemical/Chemistry-Tools.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/costume.dm
code/modules/clothing/gimmick.dm
code/modules/clothing/glasses.dm
code/modules/clothing/glasses/glasses.dm
code/modules/clothing/glasses/hud.dm
code/modules/clothing/gloves.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/jumpsuit.dm
code/modules/clothing/mask.dm
code/modules/clothing/shoes.dm
code/modules/clothing/spacesuit.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/ninja.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/spacesuits/syndi.dm
code/modules/clothing/spacesuits/void.dm
code/modules/clothing/suit.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/bomb.dm
code/modules/clothing/suits/detective.dm
code/modules/clothing/suits/fire.dm
code/modules/clothing/suits/heavy.dm
code/modules/clothing/suits/hos.dm
code/modules/clothing/suits/labcoat.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/suits/wiz_robe.dm
code/modules/clothing/uniforms/lawyer.dm
code/modules/critters/critter.dm
code/modules/critters/critter_AI.dm
code/modules/critters/critters.dm
code/modules/critters/hivebots/hivebot.dm
code/modules/flufftext/Dreaming.dm
code/modules/flufftext/Hallucination.dm
code/modules/flufftext/TextFilters.dm
code/modules/food/food.dm
code/modules/food/meat.dm
code/modules/food/recipes_microwave.dm
code/modules/maps/SwapMaps.dm
code/modules/maps/dmm_suite.dm
code/modules/maps/fromdmp.dm
code/modules/maps/randomZlevel.dm
code/modules/maps/reader.dm
code/modules/maps/writer.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/machine_unloading.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/mint.dm
code/modules/mining/ores_materials_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/death.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/death.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/alien/death.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
code/modules/mob/living/carbon/alien/humanoid/death.dm
code/modules/mob/living/carbon/alien/humanoid/hud.dm
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/humanoid/login.dm
code/modules/mob/living/carbon/alien/humanoid/queen.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/alien/larva/hud.dm
code/modules/mob/living/carbon/alien/larva/larva.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/larva/login.dm
code/modules/mob/living/carbon/alien/larva/powers.dm
code/modules/mob/living/carbon/alien/special/_main.dm
code/modules/mob/living/carbon/alien/special/snakeman.dm
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/mob/living/carbon/brain/brain.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/brain/hud.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/brain/say.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/login.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/whisper.dm
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/examine.dm
code/modules/mob/living/carbon/metroid/life.dm
code/modules/mob/living/carbon/metroid/login.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/carbon/metroid/powers.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/carbon/monkey/examine.dm
code/modules/mob/living/carbon/monkey/hud.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/login.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/mob/living/carbon/monkey/powers.dm
code/modules/mob/living/damage_procs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/login.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/examine.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/ai/login.dm
code/modules/mob/living/silicon/ai/move.dm
code/modules/mob/living/silicon/death.dm
code/modules/mob/living/silicon/decoy/death.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/pai/hud.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/mob/living/silicon/pai/recruit.dm
code/modules/mob/living/silicon/pai/software.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/examine.dm
code/modules/mob/living/silicon/robot/hud.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/silicon/robot/login.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/living/silicon/robot/say.dm
code/modules/mob/living/silicon/robot/wires.dm
code/modules/mob/living/silicon/say.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/login.dm
code/modules/mob/logout.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_grab.dm
code/modules/mob/mob_helpers.dm
code/modules/mob/mob_movement.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/mob/organ/organ.dm
code/modules/mob/organ/organ_external.dm
code/modules/mob/organ/pain.dm
code/modules/mob/say.dm
code/modules/mob/screen.dm
code/modules/mob/simple_animal/crab.dm
code/modules/mob/transform_procs.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/handlabeler.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/photocopier.dm
code/modules/paperwork/stamps.dm
code/modules/power/antimatter/computer.dm
code/modules/power/antimatter/engine.dm
code/modules/power/antimatter/fuel.dm
code/modules/power/apc.dm
code/modules/power/cable.dm
code/modules/power/cable_heavyduty.dm
code/modules/power/cell.dm
code/modules/power/generator.dm
code/modules/power/generator_type2.dm
code/modules/power/gravitygenerator.dm
code/modules/power/lighting.dm
code/modules/power/port_gen.dm
code/modules/power/sd_DynamicAreaLighting.dm
code/modules/power/singularity/collector.dm
code/modules/power/singularity/containment_field.dm
code/modules/power/singularity/emitter.dm
code/modules/power/singularity/field_generator.dm
code/modules/power/singularity/generator.dm
code/modules/power/singularity/investigate.dm
code/modules/power/singularity/particle_accelerator/particle.dm
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
code/modules/power/singularity/particle_accelerator/particle_chamber.dm
code/modules/power/singularity/particle_accelerator/particle_control.dm
code/modules/power/singularity/particle_accelerator/particle_emitter.dm
code/modules/power/singularity/particle_accelerator/particle_power.dm
code/modules/power/singularity/singularity.dm
code/modules/power/smes.dm
code/modules/power/solar.dm
code/modules/power/switch.dm
code/modules/power/turbine.dm
code/modules/projectiles/ammunition.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/energy/pulse.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/beams.dm
code/modules/projectiles/projectile/bullets.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/recycling/conveyor2.dm
code/modules/recycling/disposal-construction.dm
code/modules/recycling/disposal.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/message_server.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/rdmachines.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/scripting/AST/Operators/Binary Operators.dm
code/modules/scripting/Implementations/Telecomms.dm
code/modules/scripting/Parser/Keywords.dm
code/modules/scripting/Scanner/Tokens.dm
code/modules/scripting/stack.dm
code/modules/security levels/keycard authentication.dm
code/modules/security levels/security levels.dm
code/setup.dm
code/stylesheet.dm
code/unused/AI_Visibility.dm
code/unused/Ultralight.dm
code/unused/airtunnel.dm
code/unused/beast/bodypart.dm
code/unused/conveyor.dm
code/unused/disease2/analyser.dm
code/unused/disease2/base.dm
code/unused/disease2/biohazard destroyer.dm
code/unused/disease2/cureimplanter.dm
code/unused/disease2/curer.dm
code/unused/disease2/diseasesplicer.dm
code/unused/disease2/dishincubator.dm
code/unused/disease2/isolator.dm
code/unused/disease2/monkeydispensor.dm
code/unused/dna.dm
code/unused/gamemodes/deathmatch.dm
code/unused/jobs.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/mining/spaceship_builder_unused.dm
code/unused/new_year.dm
code/unused/spacecraft/manufacturing.dm
code/unused/spacecraft/shipcore.dm
config/README feedback.txt
config/admins.txt
config/config.txt
config/rules.html
data/mode.txt
html/add-to-changelog.html
html/archivedchangelog.html
html/changelog.css
html/changelog.html
html/changelog.js
icons/effects/blood.dmi
icons/effects/genetics.dmi
icons/misc/fullscreen.dmi
icons/mob/AI.dmi
icons/mob/alien.dmi
icons/mob/animal.dmi
icons/mob/back.dmi
icons/mob/belt.dmi
icons/mob/blob.dmi
icons/mob/critter.dmi
icons/mob/dam_human.dmi
icons/mob/eyes.dmi
icons/mob/feet.dmi
icons/mob/hands.dmi
icons/mob/head.dmi
icons/mob/human.dmi
icons/mob/human_face.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/livestock.dmi
icons/mob/mask.dmi
icons/mob/mecha.dmi
icons/mob/mob.dmi
icons/mob/monkey.dmi
icons/mob/robots.dmi
icons/mob/screen1.dmi
icons/mob/screen1_Midnight.dmi
icons/mob/screen1_Orange.dmi
icons/mob/screen1_alien.dmi
icons/mob/screen1_old.dmi
icons/mob/suit.dmi
icons/mob/uniform.dmi
icons/mob/zone_sel.dmi
icons/obj/Cryogenic2.dmi
icons/obj/aibots.dmi
icons/obj/ammo.dmi
icons/obj/atmos.dmi
icons/obj/bureaucracy.dmi
icons/obj/card.dmi
icons/obj/cigarettes.dmi
icons/obj/closet.dmi
icons/obj/clothing/glasses.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/uniforms.dmi
icons/obj/computer.dmi
icons/obj/contraband.dmi
icons/obj/decals.dmi
icons/obj/device.dmi
icons/obj/doors/DoorHazard.dmi
icons/obj/doors/door_assembly.dmi
icons/obj/drinks.dmi
icons/obj/engine.dmi
icons/obj/food.dmi
icons/obj/grenade.dmi
icons/obj/gun.dmi
icons/obj/harvest.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/obj/janitor.dmi
icons/obj/library.dmi
icons/obj/lighting.dmi
icons/obj/machines/field_generator.dmi
icons/obj/machines/gateway.dmi
icons/obj/machines/mining_machines.dmi
icons/obj/machines/particle_accelerator.dmi
icons/obj/meter.dmi
icons/obj/mining.dmi
icons/obj/objects.dmi
icons/obj/paper.dmi
icons/obj/pda.dmi
icons/obj/pipes/disposal.dmi
icons/obj/plants.dmi
icons/obj/power.dmi
icons/obj/projectiles.dmi
icons/obj/robotics.dmi
icons/obj/seeds.dmi
icons/obj/singularity.dmi
icons/obj/stationobjs.dmi
icons/obj/stock_parts.dmi
icons/obj/storage.dmi
icons/obj/structures.dmi
icons/obj/surgery.dmi
icons/obj/syringe.dmi
icons/obj/tank.dmi
icons/obj/terminals.dmi
icons/obj/toy.dmi
icons/obj/vending.dmi
icons/obj/watercloset.dmi
icons/obj/weapons.dmi
icons/obj/wizard.dmi
icons/turf/areas.dmi
icons/turf/floors.dmi
icons/turf/walls.dmi
interface/interface.dm
interface/skin.dmf
maps/Antiqua.dmm
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
maps/tgstation.2.0.9.dmm
sound/AI/animes.ogg
sound/AI/newroundsexy.ogg
sound/AI/newroundsexy2.ogg
sound/effects/adminhelp.ogg
tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest
tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt
tools/expand_filedir_paths.py
tools/readme.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-08-22 04:00:11 +10:00
cib
cc2aaf1731
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/life.dm
2012-08-06 15:18:27 -07:00
cib
9b9d541a25
Fixed response_team.dm indentation.
2012-08-06 13:43:39 -07:00
cib
7be97d0d9f
Updated response team fluff
2012-08-06 13:42:31 +02:00
FireFishie
eac1335607
Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes.
...
The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.
The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.
The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.
The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.
The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.
Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
2012-07-31 01:21:44 -04:00
Erthilo
67c5e8e3a8
Medical System Updates...
...
* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.
* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.
* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.
* Fixed CPR being performed at weird health levels.
2012-06-25 01:18:55 +01:00
Erthilo
85f75e639c
Fixes morph and appearance editing not updating sprites.
2012-06-24 01:12:16 +01:00
SkyMarshal
730461840f
UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)
2012-06-21 13:35:34 -07:00
cib
3a74270e29
Merge github.com:Baystation12/Baystation12
...
Conflicts:
code/modules/mob/mob.dm
code/modules/projectiles/projectile/change.dm
2012-05-29 13:43:20 +02:00
Erthilo
4d7b4b284c
Fixes for response team notes. Soghun removed from staff of change.
2012-05-28 20:42:47 +01:00
cib
0799cddb4b
Cleanup of all the update_clothing() calls.
...
Mostly I replaced them with rebuild_appearance() or update_body_appearance() where suitable.
I also reorganized the new update_clothing() code a bit.
2012-05-27 20:43:52 +02:00
Ren Erthilo
f0e6f64a52
Fixes ERT headsets not appearing.
2012-04-17 21:02:34 +01:00
cib
4224b2401f
ERT spawn button now in secrets.
2012-03-08 15:37:20 -08:00
SkyMarshal
66f38fb34b
TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb.
...
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
2012-02-28 18:24:43 -07:00
Albert Iordache
7df0181e60
Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity
2012-02-07 20:05:43 +02:00
SkyMarshal
cd5e2476bd
Added a new object, for storing premade outfits, that is in clothing closets.
...
Added clothing closets for several new jobs (Chef, Bartender, Virologist, etc.) and outfitted them.
Paper can now be burned, and acts as a hotspot and a light source when it is on fire.
Tweaked the Allinone broadcasters
Nerfed electrical storms
Response Team leader gets a special assignment/title.
Remapped to add Copiers, Filing Cabinets, and wardrobes
2012-01-26 22:19:33 -07:00
Hawk-v3
27beb7f3fd
ERT edits.
...
Changed the chemical amounts and added some info to each team's section, plus cloner and Cure Machine to Shuttle.
2012-01-25 23:17:04 +00:00
SkyMarshal
005593db01
Removed redundant thing.
2012-01-25 13:44:43 -07:00
SkyMarshal
d61626440c
Response Team Update:
...
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
SkyMarshal
0aee00be62
Things should be throwable past tables. Response team should work a bit better, added space suit for medics.
2012-01-25 08:41:11 -07:00
SkyMarshal
08a9cabe76
Fixed some stuff related to the previous commit.
2012-01-22 23:45:16 -07:00
SkyMarshal
a9520990f7
More updates for the response team and stuff. The response team telecomm unit now works right, radios now have an autosay proc for automated announcements, the SpecOps shuttle now uses autosay, proper energy guns replace the bugged ones, Automated (non player AI) announcement of new players, another attempt at making the command frequency legible, HUD icon for secHUDs and ERT members.
2012-01-22 22:41:17 -07:00
SkyMarshal
fa06a12b1e
Fixed some stupid stuff with the Spec Ops shuttle and the wrong energy guns given to mobs.
2012-01-22 19:41:13 -07:00
cib
c07785371d
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-19 21:10:17 -08:00
SkyMarshal
a08f21f36f
Fixed typo2
2012-01-20 12:57:44 -07:00
SkyMarshal
1bf1d5db1f
Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt.
2012-01-20 12:53:29 -07:00
cib
822c6e3923
Changes related to the response team.
...
- There's now a chance involved with the response team spawning. The more people are dead, and the more antagonists there are, the higher the chance will be.
- You can now jobban people from the response team.
2012-01-19 20:47:04 -08:00
cib
5cc7bd3081
Forgot another file.
2012-01-06 05:46:14 -08:00
