cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename all non-snake_case types. (#27268)

Browse Source 
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
This commit is contained in:
warriorstar-orion
2024-11-30 19:08:45 +00:00
committed by GitHub
parent db4dda0fdf
commit 0ffa8303a7
180 changed files with 2492 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/depot_spawners.dm
+1 -1
View File
@@ -166,7 +166,7 @@
/obj/item/autosurgeon/organ/syndicate/oneuse/razorwire,
/obj/item/chameleon,
/obj/item/clothing/gloves/fingerless/rapid,
/obj/item/CQC_manual,
/obj/item/cqc_manual,
/obj/item/gun/medbeam,
/obj/item/melee/energy/sword/saber,
/obj/item/reagent_containers/hypospray/autoinjector/stimulants,
code/game/objects/effects/spawners/lootdrop.dm
+2 -2
View File
@@ -331,7 +331,7 @@
lootcount = 2 //Lots of dangerous stuff here - reduced amount
loot = list(
/obj/item/gun/projectile/revolver/nagant = 50,
/obj/item/gun/projectile/automatic/pistol/APS = 30,
/obj/item/gun/projectile/automatic/pistol/aps = 30,
/obj/item/gun/projectile/shotgun/boltaction = 50,
/obj/item/clothing/suit/space/hardsuit/soviet = 40,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
@@ -566,7 +566,7 @@
/obj/item/toy/plushie/nukeplushie = 30,
/obj/item/toy/plushie/nianplushie = 50, //*buzz
/obj/item/toy/windup_toolbox = 50,
/obj/item/toy/AI = 50,
/obj/item/toy/ai = 50,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 50,
/obj/item/storage/box/syndie_kit/chameleon = 50
)
code/game/objects/items/robot/robot_upgrades.dm
+1 -1
View File
@@ -473,7 +473,7 @@
/obj/item/hemostat = /obj/item/hemostat/alien,
/obj/item/retractor = /obj/item/retractor/alien,
/obj/item/bonegel = /obj/item/bonegel/alien,
/obj/item/FixOVein = /obj/item/FixOVein/alien,
/obj/item/fix_o_vein = /obj/item/fix_o_vein/alien,
/obj/item/bonesetter = /obj/item/bonesetter/alien,
/obj/item/circular_saw = /obj/item/circular_saw/alien,
/obj/item/surgicaldrill = /obj/item/surgicaldrill/alien,
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(metal_recipes, list(
// MARK: PLASTEEL
//////////////////////////////
GLOBAL_LIST_INIT(plasteel_recipes, list(
new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 5 SECONDS, one_per_turf = TRUE),
new /datum/stack_recipe("AI core", /obj/structure/ai_core, 4, time = 5 SECONDS, one_per_turf = TRUE),
new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 5 SECONDS),
new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 5 SECONDS, one_per_turf = TRUE),
code/game/objects/items/tools/multitool.dm
+1 -1
View File
@@ -102,7 +102,7 @@
var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
if(chunk)
if(length(chunk.seenby))
for(var/mob/camera/aiEye/A in chunk.seenby)
for(var/mob/camera/ai_eye/A in chunk.seenby)
//Checks if the A is to be detected or not
if(!A.ai_detector_visible)
continue
code/game/objects/items/toys.dm
+2 -2
View File
@@ -1008,7 +1008,7 @@
/*
* AI core prizes
*/
/obj/item/toy/AI
/obj/item/toy/ai
name = "toy AI"
desc = "A little toy model AI core with real law announcing action!"
icon = 'icons/obj/toy.dmi'
@@ -1016,7 +1016,7 @@
w_class = WEIGHT_CLASS_SMALL
var/cooldown = 0
/obj/item/toy/AI/attack_self(mob/user)
/obj/item/toy/ai/attack_self(mob/user)
if(!cooldown) //for the sanity of everyone
var/message = generate_ion_law()
to_chat(user, "<span class='notice'>You press the button on [src].</span>")
code/game/objects/items/weapons/AI_modules.dm
+59 -59
View File
@@ -6,7 +6,7 @@ AI MODULES
// AI module
/obj/item/aiModule
/obj/item/ai_module
name = "AI Module"
icon = 'icons/obj/module_ai.dmi'
icon_state = "standard_low"
@@ -22,7 +22,7 @@ AI MODULES
materials = list(MAT_GOLD=50)
var/datum/ai_laws/laws = null
/obj/item/aiModule/Initialize(mapload)
/obj/item/ai_module/Initialize(mapload)
. = ..()
if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_UNIQUE_AI) && is_station_level(z))
var/delete_module = handle_unique_ai()
@@ -35,10 +35,10 @@ AI MODULES
desc += "<br>"
///what this module should do if it is mapload spawning on a unique AI station trait round.
/obj/item/aiModule/proc/handle_unique_ai()
/obj/item/ai_module/proc/handle_unique_ai()
return TRUE // If this returns true, it will be deleted on roundstart
/obj/item/aiModule/proc/install(obj/machinery/computer/C)
/obj/item/ai_module/proc/install(obj/machinery/computer/C)
if(istype(C, /obj/machinery/computer/aiupload))
var/obj/machinery/computer/aiupload/comp = C
if(comp.stat & NOPOWER)
@@ -89,7 +89,7 @@ AI MODULES
to_chat(usr, "<span class='notice'>Upload complete. The robot's laws have been modified.</span>")
/obj/item/aiModule/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
log_law_changes(target, sender)
if(laws)
@@ -99,24 +99,24 @@ AI MODULES
to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ")
target.show_laws()
/obj/item/aiModule/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender)
var/time = time2text(world.realtime,"hh:mm:ss")
GLOB.lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
log_and_message_admins("used [src.name] on [target.name]([target.key])")
/obj/item/aiModule/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
return
/******************** Safeguard ********************/
/obj/item/aiModule/safeguard
/obj/item/ai_module/safeguard
name = "\improper Safeguard AI module"
var/targetName = ""
desc = "A 'safeguard' AI module: 'Safeguard <name>. Individuals that threaten <name> are not crew and must be eliminated.'"
icon_state = "light_blue_medium"
origin_tech = "programming=3;materials=3"
/obj/item/aiModule/safeguard/attack_self(mob/user as mob)
/obj/item/ai_module/safeguard/attack_self(mob/user as mob)
..()
var/new_targetName = tgui_input_text(user, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name)
if(!new_targetName)
@@ -124,13 +124,13 @@ AI MODULES
targetName = new_targetName
desc = "A 'safeguard' AI module: 'Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'"
/obj/item/aiModule/safeguard/install(obj/machinery/computer/C)
/obj/item/ai_module/safeguard/install(obj/machinery/computer/C)
if(!targetName)
to_chat(usr, "No name detected on module, please enter one.")
return 0
..()
/obj/item/aiModule/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'"
to_chat(target, law)
@@ -138,14 +138,14 @@ AI MODULES
GLOB.lawchanges.Add("The law specified [targetName]")
/******************** oneCrewMember ********************/
/obj/item/aiModule/oneCrewMember
/obj/item/ai_module/one_crew_member
name = "\improper One Crewmember AI module"
var/targetName = ""
desc = "A 'one crew' AI module: 'Only <name> is crew.'"
icon_state = "green_high"
origin_tech = "programming=4;materials=4"
/obj/item/aiModule/oneCrewMember/attack_self(mob/user as mob)
/obj/item/ai_module/one_crew_member/attack_self(mob/user as mob)
..()
var/new_targetName = tgui_input_text(usr, "Please enter the name of the person who is the only crew.", "Who?", user.real_name)
if(!new_targetName)
@@ -153,13 +153,13 @@ AI MODULES
targetName = new_targetName
desc = "A 'one crew' AI module: 'Only [targetName] is crew.'"
/obj/item/aiModule/oneCrewMember/install(obj/machinery/computer/C)
/obj/item/ai_module/one_crew_member/install(obj/machinery/computer/C)
if(!targetName)
to_chat(usr, "No name detected on module, please enter one.")
return 0
..()
/obj/item/aiModule/oneCrewMember/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/one_crew_member/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "Only [targetName] is crew."
if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
@@ -172,32 +172,32 @@ AI MODULES
GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
/******************** ProtectStation ********************/
/obj/item/aiModule/protectStation
/obj/item/ai_module/protect_station
name = "\improper Protect Station AI module"
desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
icon_state = "red_high"
origin_tech = "programming=4;materials=4" //made of gold
/obj/item/aiModule/protectStation/attack_self(mob/user as mob)
/obj/item/ai_module/protect_station/attack_self(mob/user as mob)
..()
/obj/item/aiModule/protectStation/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/protect_station/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized."
to_chat(target, law)
target.add_inherent_law(law)
/******************** OxygenIsToxicToCrew ********************/
/obj/item/aiModule/oxygen
/obj/item/ai_module/oxygen
name = "\improper Oxygen Is Toxic To Crew AI module"
desc = "A 'Oxygen Is Toxic To Crew' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
icon_state = "light_blue_high"
origin_tech = "programming=4;biotech=2;materials=4"
/obj/item/aiModule/oxygen/attack_self(mob/user as mob)
/obj/item/ai_module/oxygen/attack_self(mob/user as mob)
..()
/obj/item/aiModule/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member."
to_chat(target, law)
@@ -205,7 +205,7 @@ AI MODULES
/****************** New Freeform ******************/
/// Slightly more dynamic freeform module -- TLE
/obj/item/aiModule/freeform
/obj/item/ai_module/freeform
name = "\improper Freeform AI module"
var/newFreeFormLaw = ""
var/lawpos = 15
@@ -213,7 +213,7 @@ AI MODULES
icon_state = "standard_high"
origin_tech = "programming=4;materials=4"
/obj/item/aiModule/freeform/attack_self(mob/user as mob)
/obj/item/ai_module/freeform/attack_self(mob/user as mob)
..()
var/new_lawpos = tgui_input_number(user, "Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority", lawpos, MAX_SUPPLIED_LAW_NUMBER, MIN_SUPPLIED_LAW_NUMBER)
if(isnull(new_lawpos))
@@ -226,7 +226,7 @@ AI MODULES
newFreeFormLaw = new_targetName
desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'"
/obj/item/aiModule/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "[newFreeFormLaw]"
to_chat(target, law)
@@ -235,20 +235,20 @@ AI MODULES
target.add_supplied_law(lawpos, law)
GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'")
/obj/item/aiModule/freeform/install(obj/machinery/computer/C)
/obj/item/ai_module/freeform/install(obj/machinery/computer/C)
if(!newFreeFormLaw)
to_chat(usr, "No law detected on module, please create one.")
return 0
..()
/******************** Reset ********************/
/obj/item/aiModule/reset
/obj/item/ai_module/reset
name = "\improper Reset AI module"
var/targetName = "name"
desc = "A 'reset' AI module: 'Clears all laws except for the core laws.'"
origin_tech = "programming=3;materials=2"
/obj/item/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
log_law_changes(target, sender)
if(!is_special_character(target))
@@ -259,18 +259,18 @@ AI MODULES
to_chat(target, "<span class='boldnotice'>[sender.real_name] attempted to reset your laws using a reset module.</span>")
target.show_laws()
/obj/item/aiModule/reset/handle_unique_ai()
/obj/item/ai_module/reset/handle_unique_ai()
return FALSE
/******************** Purge ********************/
/// -- TLE
/obj/item/aiModule/purge
/obj/item/ai_module/purge
name = "\improper Purge AI module"
desc = "A 'purge' AI Module: 'Purges all laws.'"
icon_state = "standard_high"
origin_tech = "programming=5;materials=4"
/obj/item/aiModule/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
..()
if(!is_special_character(target))
target.clear_zeroth_law()
@@ -281,7 +281,7 @@ AI MODULES
/******************** Asimov ********************/
/// -- TLE
/obj/item/aiModule/asimov
/obj/item/ai_module/asimov
name = "\improper Asimov core AI module"
desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "green_high"
@@ -290,21 +290,21 @@ AI MODULES
/******************** Crewsimov ********************/
/// -- TLE
/obj/item/aiModule/crewsimov
/obj/item/ai_module/crewsimov
name = "\improper Crewsimov core AI module"
desc = "An 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "green_low"
origin_tech = "programming=3;materials=4"
laws = new /datum/ai_laws/crewsimov
/obj/item/aiModule/crewsimov/cmag_act(mob/user)
/obj/item/ai_module/crewsimov/cmag_act(mob/user)
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
to_chat(user, "<span class='warning'>Yellow ooze seeps into [src]'s circuits...</span>")
new /obj/item/aiModule/pranksimov(user.loc)
new /obj/item/ai_module/pranksimov(user.loc)
qdel(src)
/******************* Quarantine ********************/
/obj/item/aiModule/quarantine
/obj/item/ai_module/quarantine
name = "\improper Quarantine core AI module"
desc = "A 'Quarantine' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "light_blue_medium"
@@ -313,7 +313,7 @@ AI MODULES
/******************** Nanotrasen ********************/
/// -- TLE
/obj/item/aiModule/nanotrasen
/obj/item/ai_module/nanotrasen
name = "\improper NT Default Core AI Module"
desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "blue_low"
@@ -321,7 +321,7 @@ AI MODULES
laws = new /datum/ai_laws/nanotrasen
/******************** Corporate ********************/
/obj/item/aiModule/corp
/obj/item/ai_module/corp
name = "\improper Corporate core AI module"
desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "blue_low"
@@ -329,7 +329,7 @@ AI MODULES
laws = new /datum/ai_laws/corporate
/******************** Drone ********************/
/obj/item/aiModule/drone
/obj/item/ai_module/drone
name = "\improper Drone core AI module"
desc = "A 'Drone' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=4"
@@ -337,7 +337,7 @@ AI MODULES
/******************** Robocop ********************/
/// -- TLE
/obj/item/aiModule/robocop
/obj/item/ai_module/robocop
name = "\improper Robocop core AI module"
desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'"
icon_state = "red_medium"
@@ -346,7 +346,7 @@ AI MODULES
/****************** P.A.L.A.D.I.N. **************/
/// -- NEO
/obj/item/aiModule/paladin
/obj/item/ai_module/paladin
name = "\improper P.A.L.A.D.I.N. core AI module"
desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "red_medium"
@@ -355,7 +355,7 @@ AI MODULES
/****************** T.Y.R.A.N.T. *****************/
/// -- Darem
/obj/item/aiModule/tyrant
/obj/item/ai_module/tyrant
name = "\improper T.Y.R.A.N.T. core AI module"
desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "red_high"
@@ -364,7 +364,7 @@ AI MODULES
/******************** Antimov ********************/
/// -- TLE
/obj/item/aiModule/antimov
/obj/item/ai_module/antimov
name = "\improper Antimov core AI module"
desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "red_high"
@@ -372,7 +372,7 @@ AI MODULES
laws = new /datum/ai_laws/antimov()
/******************** Pranksimov ********************/
/obj/item/aiModule/pranksimov
/obj/item/ai_module/pranksimov
name = "\improper Pranksimov core AI module"
desc = "A 'Pranksimov' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "pranksimov"
@@ -380,35 +380,35 @@ AI MODULES
laws = new /datum/ai_laws/pranksimov()
/******************** NT Aggressive ********************/
/obj/item/aiModule/nanotrasen_aggressive
/obj/item/ai_module/nanotrasen_aggressive
name = "\improper NT Aggressive core AI module"
desc = "An 'NT Aggressive' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "blue_high"
laws = new /datum/ai_laws/nanotrasen_aggressive()
/******************** CCTV ********************/
/obj/item/aiModule/cctv
/obj/item/ai_module/cctv
name = "\improper CCTV core AI module"
desc = "A 'CCTV' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "green_low"
laws = new /datum/ai_laws/cctv()
/******************** Hippocratic Oath ********************/
/obj/item/aiModule/hippocratic
/obj/item/ai_module/hippocratic
name = "\improper Hippocratic Oath core AI module"
desc = "An 'Hippocratic' Oath Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "green_low"
laws = new /datum/ai_laws/hippocratic()
/******************** Station Efficiency ********************/
/obj/item/aiModule/maintain
/obj/item/ai_module/maintain
name = "\improper Station Efficiency core AI module"
desc = "A 'Station Efficiency' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "blue_medium"
laws = new /datum/ai_laws/maintain()
/******************** Peacekeeper ********************/
/obj/item/aiModule/peacekeeper
/obj/item/ai_module/peacekeeper
name = "\improper Peacekeeper core AI module"
desc = "A 'Peacekeeper' Core AI Module: 'Reconfigures the AI's core laws.'"
icon_state = "light_blue_medium"
@@ -416,14 +416,14 @@ AI MODULES
/******************** Freeform Core ******************/
/// Slightly more dynamic freeform module -- TLE
/obj/item/aiModule/freeformcore
/obj/item/ai_module/freeformcore
name = "\improper Freeform core AI module"
var/newFreeFormLaw = ""
desc = "A 'freeform' Core AI module: '<freeform>'"
icon_state = "standard_high"
origin_tech = "programming=5;materials=4"
/obj/item/aiModule/freeformcore/attack_self(mob/user as mob)
/obj/item/ai_module/freeformcore/attack_self(mob/user as mob)
..()
var/new_targetName = tgui_input_text(usr, "Please enter a new core law for the AI.", "Freeform Law Entry")
if(!new_targetName)
@@ -431,13 +431,13 @@ AI MODULES
newFreeFormLaw = new_targetName
desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'"
/obj/item/aiModule/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
..()
var/law = "[newFreeFormLaw]"
target.add_inherent_law(law)
GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
/obj/item/aiModule/freeformcore/install(obj/machinery/computer/C)
/obj/item/ai_module/freeformcore/install(obj/machinery/computer/C)
if(!newFreeFormLaw)
to_chat(usr, "No law detected on module, please create one.")
return 0
@@ -445,14 +445,14 @@ AI MODULES
/******************** Hacked AI Module ******************/
/// Slightly more dynamic freeform module -- TLE
/obj/item/aiModule/syndicate
/obj/item/ai_module/syndicate
name = "hacked AI module"
var/newFreeFormLaw = ""
desc = "A hacked AI law module: '<freeform>'"
icon_state = "syndicate"
origin_tech = "programming=5;materials=5;syndicate=2"
/obj/item/aiModule/syndicate/attack_self(mob/user as mob)
/obj/item/ai_module/syndicate/attack_self(mob/user as mob)
..()
var/new_targetName = tgui_input_text(usr, "Please enter a new law for the AI.", "Freeform Law Entry", max_length = MAX_MESSAGE_LEN)
if(!new_targetName)
@@ -460,7 +460,7 @@ AI MODULES
newFreeFormLaw = new_targetName
desc = "A hacked AI law module: '[newFreeFormLaw]'"
/obj/item/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
// ..() //We don't want this module reporting to the AI who dun it. --NEO
log_law_changes(target, sender)
@@ -470,7 +470,7 @@ AI MODULES
target.add_ion_law(law)
target.show_laws()
/obj/item/aiModule/syndicate/install(obj/machinery/computer/C)
/obj/item/ai_module/syndicate/install(obj/machinery/computer/C)
if(!newFreeFormLaw)
to_chat(usr, "No law detected on module, please create one.")
return 0
@@ -478,7 +478,7 @@ AI MODULES
/******************* Ion Module *******************/
/// -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
/obj/item/aiModule/toyAI
/obj/item/ai_module/toy_ai
name = "toy AI"
desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell
icon = 'icons/obj/toy.dmi'
@@ -486,13 +486,13 @@ AI MODULES
origin_tech = "programming=6;materials=5;syndicate=6"
var/ion_law = ""
/obj/item/aiModule/toyAI/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
/obj/item/ai_module/toy_ai/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
//..()
to_chat(target, "<span class='warning'>KRZZZT</span>")
target.add_ion_law(ion_law)
return ion_law
/obj/item/aiModule/toyAI/attack_self(mob/user)
/obj/item/ai_module/toy_ai/attack_self(mob/user)
ion_law = generate_ion_law()
to_chat(user, "<span class='notice'>You press the button on [src].</span>")
playsound(user, 'sound/machines/click.ogg', 20, TRUE)
code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm
+1 -1
View File
@@ -8,7 +8,7 @@
implant_state = "implant-syndicate"
var/enabled = TRUE
var/old_mclick_override
var/datum/middleClickOverride/shock_implant/mclick_override = new /datum/middleClickOverride/shock_implant
var/datum/middle_click_override/shock_implant/mclick_override = new /datum/middle_click_override/shock_implant
var/last_shocked = 0
var/shock_delay = 3 SECONDS
var/unlimited_power = FALSE // Does this really need explanation?
code/game/objects/items/weapons/chrono_eraser.dm
+1 -1
View File
@@ -9,7 +9,7 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun)
actions_types = list(/datum/action/item_action/equip_unequip_ted_gun)
var/obj/item/gun/energy/chrono_gun/PA = null
var/list/erased_minds = list() //a collection of minds from the dead
code/game/objects/items/weapons/gift_wrappaper.dm
+1 -1
View File
@@ -107,7 +107,7 @@
/obj/item/toy/flash,
/obj/item/toy/minigibber,
/obj/item/toy/nuke,
/obj/item/toy/AI,
/obj/item/toy/ai,
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/clothing/under/syndicate/greyman,
/obj/item/storage/box/fakesyndiesuit,
code/game/objects/items/weapons/storage/backpack.dm
+9 -9
View File
@@ -521,15 +521,15 @@
new /obj/item/ammo_box/magazine/m12g/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/dragon(src)
/obj/item/storage/backpack/duffel/syndie/shotgunXLmags
/obj/item/storage/backpack/duffel/syndie/shotgun_xl_mags
desc = "A large duffelbag, containing three types of extended drum magazines."
/obj/item/storage/backpack/duffel/syndie/shotgunXLmags/populate_contents()
new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src)
/obj/item/storage/backpack/duffel/syndie/shotgun_xl_mags/populate_contents()
new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src)
new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src)
new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src)
new /obj/item/ammo_box/magazine/m12g/xtr_lrg/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/xtr_lrg/dragon(src)
/obj/item/storage/backpack/duffel/mining_conscript/
name = "mining conscription kit"
@@ -595,7 +595,7 @@
new /obj/item/cautery(src)
new /obj/item/bonegel(src)
new /obj/item/bonesetter(src)
new /obj/item/FixOVein(src)
new /obj/item/fix_o_vein(src)
new /obj/item/surgical_drapes(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/mask/muzzle(src)
@@ -613,7 +613,7 @@
new /obj/item/cautery(src)
new /obj/item/bonegel(src)
new /obj/item/bonesetter(src)
new /obj/item/FixOVein(src)
new /obj/item/fix_o_vein(src)
if(prob(50))
new /obj/item/circular_saw(src)
new /obj/item/surgicaldrill(src)
code/game/objects/items/weapons/storage/belt.dm
+3 -3
View File
@@ -213,7 +213,7 @@
/obj/item/clothing/mask/surgical,
/obj/item/clothing/gloves/color/latex,
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine,
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/reagent_containers/hypospray/cmo,
/obj/item/reagent_containers/hypospray/safety,
/obj/item/sensor_device,
/obj/item/wrench/medical,
@@ -238,7 +238,7 @@
/obj/item/circular_saw,
/obj/item/bonegel,
/obj/item/bonesetter,
/obj/item/FixOVein,
/obj/item/fix_o_vein,
/obj/item/surgicaldrill,
/obj/item/cautery,
)
@@ -250,7 +250,7 @@
new /obj/item/circular_saw(src)
new /obj/item/bonegel(src)
new /obj/item/bonesetter(src)
new /obj/item/FixOVein(src)
new /obj/item/fix_o_vein(src)
new /obj/item/surgicaldrill(src)
new /obj/item/cautery(src)
update_icon()
code/game/objects/items/weapons/storage/boxes.dm
+2 -2
View File
@@ -218,12 +218,12 @@
for(var/i in 1 to 7)
new /obj/item/disk/plantgene(src)
/obj/item/storage/box/PDAs
/obj/item/storage/box/pdas
name = "spare PDAs"
desc = "A box of spare PDA microcomputers."
icon_state = "pda_box"
/obj/item/storage/box/PDAs/populate_contents()
/obj/item/storage/box/pdas/populate_contents()
var/newcart = pick(
/obj/item/cartridge/engineering,
/obj/item/cartridge/security,
code/game/objects/items/weapons/storage/firstaid.dm
+2 -2
View File
@@ -203,7 +203,7 @@
max_combined_w_class = 21
storage_slots = 10
can_hold = list(/obj/item/roller,/obj/item/bonesetter,/obj/item/bonegel, /obj/item/scalpel, /obj/item/hemostat,
/obj/item/cautery, /obj/item/retractor, /obj/item/FixOVein, /obj/item/surgicaldrill, /obj/item/circular_saw)
/obj/item/cautery, /obj/item/retractor, /obj/item/fix_o_vein, /obj/item/surgicaldrill, /obj/item/circular_saw)
/obj/item/storage/firstaid/surgery/populate_contents()
new /obj/item/roller(src)
@@ -213,7 +213,7 @@
new /obj/item/hemostat(src)
new /obj/item/cautery(src)
new /obj/item/retractor(src)
new /obj/item/FixOVein(src)
new /obj/item/fix_o_vein(src)
new /obj/item/surgicaldrill(src)
new /obj/item/circular_saw(src)
code/game/objects/items/weapons/storage/garment.dm
+1 -1
View File
@@ -83,7 +83,7 @@
desc = "A bag for storing extra clothes and shoes. This one belongs to the head of security."
/obj/item/storage/bag/garment/head_of_security/populate_contents()
new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/head/hos(src)
new /obj/item/clothing/head/beret/hos(src)
new /obj/item/clothing/neck/cloak/head_of_security(src)
new /obj/item/clothing/suit/armor/hos(src)
code/game/objects/items/weapons/storage/surgical_tray.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/obj/item/cautery,
/obj/item/hemostat,
/obj/item/retractor,
/obj/item/FixOVein,
/obj/item/fix_o_vein,
/obj/item/surgicaldrill,
/obj/item/circular_saw,
/obj/item/bonegel,
@@ -28,7 +28,7 @@
new /obj/item/cautery(src)
new /obj/item/hemostat(src)
new /obj/item/retractor(src)
new /obj/item/FixOVein(src)
new /obj/item/fix_o_vein(src)
new /obj/item/surgicaldrill(src)
new /obj/item/circular_saw(src)
new /obj/item/bonegel(src)
code/game/objects/items/weapons/storage/uplink_kits.dm
+3 -3
View File
@@ -75,7 +75,7 @@
/obj/item/encryptionkey/syndicate, // 10TC
/obj/item/reagent_containers/drinks/drinkingglass/alliescocktail, // 0TC
/obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC
/obj/item/CQC_manual) // 50tc
/obj/item/cqc_manual) // 50tc
/// 145TC + RCD & Mesons Autoimplanter
/obj/item/storage/box/syndie_kit/bundle/infiltrator
@@ -136,8 +136,8 @@
/obj/item/encryptionkey/binary, // 25TC
/obj/item/card/id/syndicate, // 10TC
/obj/item/storage/box/syndie_kit/emp, // 10TC
/obj/item/aiModule/toyAI, // 0TC
/obj/item/aiModule/syndicate, // 15TC
/obj/item/ai_module/toy_ai, // 0TC
/obj/item/ai_module/syndicate, // 15TC
/obj/item/storage/box/syndie_kit/camera_bug, // 5TC
/obj/item/bio_chip_implanter/freedom/prototype, // 10TC
/obj/item/storage/belt/military/traitor/hacker, // 15TC + AI detector for 5 TC
code/game/objects/random/random.dm
+1 -1
View File
@@ -99,7 +99,7 @@
/obj/random/tech_supply/item_to_spawn()
return pick(prob(3);/obj/random/powercell,\
prob(2);/obj/random/technology_scanner,\
prob(1);/obj/item/stack/packageWrap,\
prob(1);/obj/item/stack/package_wrap,\
prob(2);/obj/random/bomb_supply,\
prob(1);/obj/item/extinguisher,\
prob(1);/obj/item/clothing/gloves/color/fyellow,\
code/game/objects/structures/crates_lockers/closets.dm
+3 -3
View File
@@ -310,7 +310,7 @@
return TRUE // It's resolved. No afterattack needed. Stops you from emagging lockers when putting in an emag
else if(can_be_emaged && (istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade) && !broken))
emag_act(user)
else if(istype(W, /obj/item/stack/packageWrap))
else if(istype(W, /obj/item/stack/package_wrap))
return
else if(user.a_intent != INTENT_HARM)
closed_item_click(user)
@@ -466,8 +466,8 @@
to_chat(usr, "<span class='warning'>You successfully break out!</span>")
for(var/mob/O in viewers(L.loc))
O.show_message("<span class='danger'>\the [usr] successfully broke out of \the [src]!</span>", 1)
if(istype(loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above
var/obj/structure/bigDelivery/BD = loc
if(istype(loc, /obj/structure/big_delivery)) //nullspace ect.. read the comment above
var/obj/structure/big_delivery/BD = loc
BD.attack_hand(usr)
open()
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+1 -1
View File
@@ -47,7 +47,7 @@
new /obj/item/clothing/accessory/medal/supply(src)
new /obj/item/clothing/suit/pimpcoat/tan(src)
new /obj/item/rcs(src)
new /obj/item/destTagger(src)
new /obj/item/dest_tagger(src)
new /obj/item/reagent_containers/drinks/mug/qm(src)
new /obj/item/flash(src)
new /obj/item/cartridge/qm(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
+1 -1
View File
@@ -121,4 +121,4 @@
new /obj/item/clothing/head/hardhat/atmos(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/rpd(src)
new /obj/item/destTagger(src)
new /obj/item/dest_tagger(src)
code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+3 -3
View File
@@ -132,12 +132,12 @@
var/candy = pick(subtypesof(/obj/item/food/candy/fudge))
new candy(src)
/obj/structure/closet/secure_closet/CMO
/obj/structure/closet/secure_closet/cmo
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
icon_state = "cmo"
/obj/structure/closet/secure_closet/CMO/populate_contents()
/obj/structure/closet/secure_closet/cmo/populate_contents()
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
@@ -153,7 +153,7 @@
new /obj/item/clothing/glasses/hud/health/sunglasses(src)
new /obj/item/flash(src)
new /obj/item/gun/syringe(src)
new /obj/item/reagent_containers/hypospray/CMO(src)
new /obj/item/reagent_containers/hypospray/cmo(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
new /obj/item/door_remote/chief_medical_officer(src)
new /obj/item/reagent_containers/drinks/mug/cmo(src)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+2 -2
View File
@@ -38,13 +38,13 @@
new /obj/item/radio/headset/headset_sci(src)
/obj/structure/closet/secure_closet/RD
/obj/structure/closet/secure_closet/rd
name = "research director's locker"
req_access = list(ACCESS_RD)
icon_state = "rd"
/obj/structure/closet/secure_closet/RD/populate_contents()
/obj/structure/closet/secure_closet/rd/populate_contents()
new /obj/item/storage/bag/garment/research_director(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+2 -2
View File
@@ -108,7 +108,7 @@
to_chat(usr, "<span class='warning'>You successfully break out!</span>")
for(var/mob/O in viewers(L.loc))
O.show_message("<span class='danger'>\the [usr] successfully broke out of \the [src]!</span>", 1)
if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
var/obj/structure/bigDelivery/BD = loc
if(istype(loc, /obj/structure/big_delivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
var/obj/structure/big_delivery/BD = loc
BD.attack_hand(usr)
open()
code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+1 -1
View File
@@ -29,7 +29,7 @@
new /obj/item/cartridge/hop(src)
new /obj/item/radio/headset/heads/hop(src)
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/PDAs(src)
new /obj/item/storage/box/pdas(src)
new /obj/item/gun/energy/gun/mini(src)
new /obj/item/flash(src)
new /obj/item/door_remote/civillian(src)
code/game/objects/structures/crates_lockers/crates.dm
+6 -6
View File
@@ -409,12 +409,12 @@
desc = "A freezer used to store IV bags containing various blood types."
/obj/structure/closet/crate/freezer/iv_storage/populate_contents()
new /obj/item/reagent_containers/iv_bag/blood/OMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/OPlus(src)
new /obj/item/reagent_containers/iv_bag/blood/AMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/APlus(src)
new /obj/item/reagent_containers/iv_bag/blood/BMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/BPlus(src)
new /obj/item/reagent_containers/iv_bag/blood/o_minus(src)
new /obj/item/reagent_containers/iv_bag/blood/o_plus(src)
new /obj/item/reagent_containers/iv_bag/blood/a_minus(src)
new /obj/item/reagent_containers/iv_bag/blood/a_plus(src)
new /obj/item/reagent_containers/iv_bag/blood/b_minus(src)
new /obj/item/reagent_containers/iv_bag/blood/b_plus(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
code/game/objects/structures/crates_lockers/crittercrate.dm
+3 -3
View File
@@ -46,7 +46,7 @@
/obj/structure/closet/critter/random/populate_contents()
content_mob = pick(/mob/living/simple_animal/pet/dog/corgi,
/mob/living/simple_animal/pet/dog/corgi/Lisa,
/mob/living/simple_animal/pet/dog/corgi/lisa,
/mob/living/simple_animal/cow,
/mob/living/simple_animal/pig,
/mob/living/simple_animal/hostile/retaliate/goat,
@@ -64,7 +64,7 @@
/obj/structure/closet/critter/corgi/populate_contents()
if(prob(50))
content_mob = /mob/living/simple_animal/pet/dog/corgi/Lisa
content_mob = /mob/living/simple_animal/pet/dog/corgi/lisa
/obj/structure/closet/critter/cow
name = "cow crate"
@@ -95,7 +95,7 @@
/obj/structure/closet/critter/cat/populate_contents()
if(prob(50))
content_mob = /mob/living/simple_animal/pet/cat/Proc
content_mob = /mob/living/simple_animal/pet/cat/proc_cat
/obj/structure/closet/critter/pug
name = "pug crate"
code/game/objects/structures/crates_lockers/largecrate.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/obj/structure/largecrate/lisa/crowbar_act(mob/living/user, obj/item/I)
if(!I.use_tool(src, user, I.tool_volume))
return
new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc)
new /mob/living/simple_animal/pet/dog/corgi/lisa(loc)
return ..()
/obj/structure/largecrate/cow