7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d844de22ad375d
2024-02-20 11:28:51 +01:00
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
1016e08307
Allows autotraitor in secret to start with 0 players
2016-09-01 18:29:28 +01:00
c589c0bc64
Makes secret not shit
2016-07-20 18:33:46 +01:00
8e90199052
Generic Station & System Name
...
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
2016-05-16 15:34:03 -04:00
141962b22f
Adds lizard, visitors and intrigue game modes.
2016-03-16 11:11:44 -04:00
53cbd2bbe0
Alters the secret player requirements for various game modes:
...
https://docs.google.com/document/d/1oCuSNmWOhNOzGk9AHmZeVhFPX9Qr0LHSqyxH7ocaXD0/edit
2015-11-28 23:08:11 +00:00
78e5701b5c
Replaces most instances of Nyx to Vir.
2015-11-26 01:01:06 -05:00
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
9d5f14298d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
3951b1d62c
Added a handful of new mixed-antagonist modes.
2015-09-05 18:05:39 +09:30
89a7c9667b
Reverts a testing value.
2015-09-05 17:31:27 +09:30
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04:00
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
1d736b368e
Rounds no longer end on antag death
2015-08-30 00:52:38 -04:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
99ba26f1ee
It is no longer possible to define the amount of telecrystals per game mode.
2015-06-18 10:59:45 +02:00
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
c55f807b42
Removes random Telecrystal grants, instead increases the start amount by 2.
2015-02-23 20:56:48 +01:00
87998f7eb1
Fixes #7295 .
...
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
253fcc4551
Uplink Shopping List
...
At round end players are presented with how which items a given traitor/mercenary team bought, and how much they spent.
2014-10-30 08:49:50 +01:00
99ff852e46
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-19 16:05:40 +10:30
4f7b32ae4f
Round-end summary now also lists job
2014-09-30 10:07:59 +02:00
fe126626ac
Cleans up radio frequency numbers.
...
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
61d40e2405
Non-random traitor code word assignment.
2014-08-24 12:47:48 +02:00
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
736741a5c2
Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists
2014-08-16 19:08:22 +02:00
f2393d9465
Replaces antag intro text and objective announcement with a proc.
2014-07-30 21:36:31 +09:30
cd971fb4ea
Fixes a missing config check in autotraitor
...
Also adds a config check to the various forge_* procs just to be sure.
2014-06-19 00:01:47 -04:00
5690e2e4c7
Code cleanup for traitors
2014-02-15 23:42:37 -08:00
9c803dc1f6
Added the rest of the objectiveless antag types
2014-02-04 23:51:34 -08:00
8813123997
added config flags for objectives being enabled or disabled.
...
added antag options menu.
added ability to choose where a syndicate uplink is installed.
2013-11-29 17:02:23 -08:00
1a0aaebfc1
"Fixes" law 0.
2013-08-28 01:55:02 +01:00
0bfb43b864
Removed hijack objective. AGAIN.
2013-05-24 00:09:47 +02:00
65d79e6ec1
Fixed runtime in traitor equip.
2013-02-20 08:58:09 +04:00
863a9deb7b
Added NT relation preference.
2013-02-09 17:55:53 +01:00
66ce65a680
minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-21 19:15:38 +10:00
1bdfe2e442
Traitor objectives are now checked regularly.
...
This doesn't mean the game can end early, it just means certain traitor objectives get a chance to process themselves before the round ended. For instance, the brig objective can now check periodically how long someone's been in the brig.
2012-12-19 22:27:15 +01:00
f633e61f9e
Added a harm objective.
...
Objective is to break a bone, delimb, or disfigure their face.
2012-12-11 16:40:01 +01:00
e218061c5e
Added brig objective to traitors.
2012-12-11 15:57:58 +01:00
cccff0881f
Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport
...
Conflicts:
code/game/gamemodes/events.dm
code/game/gamemodes/events/space_ninja.dm
code/game/machinery/atmo_control.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/objects/structures/watercloset.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/new_player/new_player.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:07:41 +10:00
7d6fb8fd6a
Commiting for Aranclanos.
...
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10189&p=143580&hilit=https%3A%2F%2Fwww.dropbox.com%2Fs%2Fcwflgm7793ts20s%2FBorgsForCasualsRELOADED.patch#p143580
-Fixed some ugly text in Ion laws "THE STATION IS [0x6006265] FETISHES...LAWS UPDATED".
-Fixed some typos on the Ion laws.
-When borgs are emagged, now they show their laws for themselves.
-When new laws are uploaded, the borg gets instantly the new laws, just like the AI, instead of the confusing message "Your AI has set your 'laws waiting' flag.". Remember this is a patch for casuals.
-The borgs gets the same message than the AI in Ion storms.
-Made the admin Ion storm show the "...LAWS UPDATED" text.
-Borgs get a different law 0 telling them to help their master.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4837 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 05:37:28 +00:00
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
be76c3afcc
Fixed issue 645.
...
I changed how uplinks worked. Instead of there being a duplicate item which would switch out when it activates, there's an item called "obj/item/device/uplink/hidden". It is a hidden uplink which you can place in any obj/item. In "hidden" is where it will generate menus, check for triggers to show the menu and etc.. No need to switch out with duplicate items or add the menu onto the PDA's notes.
How to create a new uplink item in 3 easy steps!
1. All obj/item 's have a hidden_uplink var. By default it's null. Give the item one with "new(src)", it must be in it's contents. Feel free to add/remove "uses".
2. Code in the triggers. Use check_trigger for this, I recommend closing the item's menu with "usr << browse(null, "window=windowname") if it returns true. The var/value is the value that will be compared with the var/target. If they are equal it will activate the menu.
3. If you want the menu to stay until the users locks his uplink, add an active_uplink_check(mob/user as mob) in your interact/attack_hand proc. Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu.
I've given the recharge station's verbs a category so they don't create their own tab.
I've added a mob/proc called put_in_any_hand_if_possible. Name speaks for itself. Returns true if successful, false otherwise.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4450 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 21:57:27 +00:00
49a8f89a42
Resolves Issue 766
...
Fix for colours bleeding over in the end-of-round announcements.
Cause: laziness :3
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4362 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-11 02:02:32 +00:00
Drathek