-Please wait until completion...
-
-"} - else - dat = {" -Metal Amount: [min(150000, src.metal_amount)] cm3 (MAX: 150,000)
-
-Left Arm (25,000 cc metal.)
-Right Arm (25,000 cc metal.)
-Left Leg (25,000 cc metal.)
-Right Leg (25,000 cc metal).
-Chest (50,000 cc metal).
-Head (50,000 cc metal).
-Robot Frame (75,000 cc metal).
-"} - - user << browse("
Refresh"
+ dat += "[PDAIMG(refresh)]Refresh"
if ((!isnull(cartridge)) && (mode == 0))
- dat += " | 
Eject [cartridge]"
+ dat += " | [PDAIMG(eject)]Eject [cartridge]"
if (mode)
- dat += " | 
Return"
+ dat += " | [PDAIMG(menu)]Return"
if (mode == 0)
dat += ""
@@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if (!owner)
dat += "Warning: No owner information entered. Please swipe card.
" - dat += "Retry"
+ dat += "[PDAIMG(refresh)]Retry"
else
switch (mode)
if (0)
@@ -221,38 +221,38 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "
"
+ dat += "
" if(notescanned) dat += "(This is a scanned image, editing it may cause some text formatting to change.)
" dat += "
[(!notehtml ? note : notehtml)]" if (2) - dat += "
"
- dat += "
Ringer: [silent == 1 ? "Off" : "On"] | "
- dat += "
Send / Receive: [toff == 1 ? "Off" : "On"] | "
- dat += "Set Ringtone | "
- dat += "Messages
" + dat += "
" if(cartridge) dat += cartridge.message_header() - dat += "
"
+ dat += "
" - dat += "
Retry"
+ dat += "[PDAIMG(refresh)]Retry"
else
switch (mode)
if (0)
@@ -221,38 +221,38 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "General Functions
" dat += "- "
- dat += "
Notekeeper "
- dat += "- Messenger "
+ dat += "
- [PDAIMG(notes)]Notekeeper " + dat += "
- [PDAIMG(mail)]Messenger " if (cartridge) if (cartridge.access & CART_CLOWN) - dat += "
Honk Synthesizer "
- dat += "- Sad Trombone "
+ dat += "
- [PDAIMG(honk)]Honk Synthesizer " + dat += "
- [PDAIMG(honk)]Sad Trombone " if (cartridge.access & CART_MANIFEST) - dat += "
- View Crew Manifest "
+ dat += "
- [PDAIMG(notes)]View Crew Manifest " if(cartridge.access & CART_STATUS_DISPLAY) - dat += "
Set Status Display "
+ dat += "- [PDAIMG(status)]Set Status Display " dat += "
Engineering Functions
" dat += "- "
- dat += "
Power Monitor "
+ dat += "- [PDAIMG(power)]Power Monitor " dat += "
Medical Functions
" dat += "- "
- dat += "
Medical Records "
- dat += "
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner "
+ dat += "- [PDAIMG(medical)]Medical Records " + dat += "
- [PDAIMG(scanner)][scanmode == 1 ? "Disable" : "Enable"] Medical Scanner " dat += "
Security Functions
" dat += "- "
- dat += "
Security Records "
+ dat += "- [PDAIMG(cuffs)]Security Records " dat += "
Quartermaster Functions:
" dat += "- "
- dat += "
Supply Records "
+ dat += "- [PDAIMG(crate)]Supply Records " dat += "
- "
if (cartridge)
if(cartridge.bot_access_flags)
- dat += "
Bots Access "
+ dat += "- [PDAIMG(medbot)]Bots Access " if (cartridge.access & CART_JANITOR) - dat += "
Custodial Locator "
+ dat += "- [PDAIMG(bucket)]Custodial Locator " if (istype(cartridge.radio)) - dat += "
Signaler System "
+ dat += "- [PDAIMG(signaler)]Signaler System " if (cartridge.access & CART_NEWSCASTER) - dat += "
- Newscaster Access "
+ dat += "
- [PDAIMG(notes)]Newscaster Access " if (cartridge.access & CART_REAGENT_SCANNER) - dat += "
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner "
+ dat += "- [PDAIMG(reagent)][scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner " if (cartridge.access & CART_ENGINE) - dat += "
- [scanmode == 4 ? "Disable" : "Enable"] Halogen Counter "
+ dat += "
- [PDAIMG(reagent)][scanmode == 4 ? "Disable" : "Enable"] Halogen Counter " if (cartridge.access & CART_ATMOS) - dat += "
- [scanmode == 5 ? "Disable" : "Enable"] Gas Scanner "
+ dat += "
- [PDAIMG(reagent)][scanmode == 5 ? "Disable" : "Enable"] Gas Scanner " if (cartridge.access & CART_REMOTE_DOOR) - dat += "
Toggle Remote Door "
+ dat += "- [PDAIMG(rdoor)]Toggle Remote Door " if (cartridge.access & CART_DRONEPHONE) - dat += "
Drone Phone "
- dat += "
Atmospheric Scan "
- dat += "
[fon ? "Disable" : "Enable"] Flashlight "
+ dat += "- [PDAIMG(dronephone)]Drone Phone " + dat += "
- [PDAIMG(atmos)]Atmospheric Scan " + dat += "
- [PDAIMG(flashlight)][fon ? "Disable" : "Enable"] Flashlight " if (pai) if(pai.loc != src) pai = null @@ -289,23 +289,23 @@ GLOBAL_LIST_EMPTY(PDAs) dat += "
Notekeeper V2.2
"
+ dat += "[PDAIMG(notes)] Notekeeper V2.2
" dat += "Edit" if(notescanned) dat += "(This is a scanned image, editing it may cause some text formatting to change.)
" dat += "
[(!notehtml ? note : notehtml)]" if (2) - dat += "
SpaceMessenger V3.9.6
"
- dat += "Ringer: [silent == 1 ? "Off" : "On"] | "
- dat += "Send / Receive: [toff == 1 ? "Off" : "On"] | "
- dat += "Set Ringtone | "
- dat += "Messages" + dat += "
[PDAIMG(mail)] SpaceMessenger V3.9.6
" + dat += "[PDAIMG(bell)]Ringer: [silent == 1 ? "Off" : "On"] | " + dat += "[PDAIMG(mail)]Send / Receive: [toff == 1 ? "Off" : "On"] | " + dat += "[PDAIMG(bell)]Set Ringtone | " + dat += "[PDAIMG(mail)]Messages" if(cartridge) dat += cartridge.message_header() - dat += "
Detected PDAs
"
+ dat += "[PDAIMG(menu)] Detected PDAs
" dat += "- "
var/count = 0
@@ -326,16 +326,16 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "Send To All"
if(21)
- dat += "
SpaceMessenger V3.9.6
"
- dat += "
Clear Messages"
+ dat += "[PDAIMG(mail)] SpaceMessenger V3.9.6
" + dat += "[PDAIMG(blank)]Clear Messages" - dat += " Messages
"
+ dat += "[PDAIMG(mail)] Messages
" dat += tnote dat += "" if (3) - dat += "
Atmospheric Readings
"
+ dat += "[PDAIMG(atmos)] Atmospheric Readings
" var/turf/T = user.loc if (isnull(T)) @@ -617,7 +617,8 @@ GLOBAL_LIST_EMPTY(PDAs) return if((last_text && world.time < last_text + 10) || (everyone && last_everyone && world.time < last_everyone + PDA_SPAM_DELAY)) return - + if(prob(1)) + message += "\nSent from my PDA" // Send the signal var/list/string_targets = list() for (var/obj/item/pda/P in targets) @@ -1017,4 +1018,4 @@ GLOBAL_LIST_EMPTY(PDAs) #undef PDA_SCANNER_REAGENT #undef PDA_SCANNER_HALOGEN #undef PDA_SCANNER_GAS -#undef PDA_SPAM_DELAY \ No newline at end of file +#undef PDA_SPAM_DELAY diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index c1cc5d69a3..089286efda 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -21,7 +21,7 @@ // Special AI/pAI PDAs that cannot explode. /obj/item/pda/ai - icon_state = "NONE" + icon = null ttone = "data" fon = FALSE detonatable = FALSE diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 2737f24cbe..e92eb6e617 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -207,13 +207,12 @@ frequency.post_signal(src, status_signal) - /obj/item/cartridge/proc/generate_menu(mob/user) if(!host_pda) return switch(host_pda.mode) if(40) //signaller - menu = " Remote Signaling System
"
+ menu = "[PDAIMG(signaler)] Remote Signaling System
" menu += {" Send Signal@@ -232,7 +231,7 @@ Code: +
"} if (41) //crew manifest - menu = "
Crew Manifest
"
+ menu = "[PDAIMG(notes)] Crew Manifest
" menu += "Entries cannot be modified from this terminal." if(GLOB.data_core.general) for (var/datum/data/record/t in sortRecord(GLOB.data_core.general)) @@ -241,7 +240,7 @@ Code: if (42) //status displays - menu = "
Station Status Display Interlink
"
+ menu = "[PDAIMG(status)] Station Status Display Interlink
" menu += "\[ Clear \]" menu += "\[ Shuttle ETA \]
" @@ -254,7 +253,7 @@ Code: menu += " Biohazard \]
" if (43) - menu = "
Power Monitors - Please select one
" + menu = "
[PDAIMG(power)] Power Monitors - Please select one
" powmonitor = null powermonitors = list() var/powercount = 0 @@ -280,7 +279,7 @@ Code: menu += "" if (433) - menu = "
Power Monitor
" + menu = "
[PDAIMG(power)] Power Monitor
" if(!powmonitor) menu += "No connection
" else @@ -307,13 +306,13 @@ Code: menu += "" if (44) //medical records //This thing only displays a single screen so it's hard to really get the sub-menu stuff working. - menu = "
Medical Record List
"
+ menu = "[PDAIMG(medical)] Medical Record List
" if(GLOB.data_core.general) for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) menu += "[R.fields["id"]]: [R.fields["name"]]" menu += "
" if(441) - menu = "
Medical Record
"
+ menu = "[PDAIMG(medical)] Medical Record
" if(active1 in GLOB.data_core.general) menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" @@ -328,7 +327,7 @@ Code: menu += "
" - menu += "
Medical Data
"
+ menu += "[PDAIMG(medical)] Medical Data
" if(active2 in GLOB.data_core.medical) menu += "Blood Type: [active2.fields["blood_type"]]" @@ -350,14 +349,14 @@ Code: menu += "
" if (45) //security records - menu = "
Security Record List
"
+ menu = "[PDAIMG(cuffs)] Security Record List
" if(GLOB.data_core.general) for (var/datum/data/record/R in sortRecord(GLOB.data_core.general)) menu += "[R.fields["id"]]: [R.fields["name"]]" menu += "
" if(451) - menu = "
Security Record
"
+ menu = "[PDAIMG(cuffs)] Security Record
" if(active1 in GLOB.data_core.general) menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" @@ -372,7 +371,7 @@ Code: menu += "
" - menu += "
Security Data
"
+ menu += "[PDAIMG(cuffs)] Security Data
" if(active3 in GLOB.data_core.security) menu += "Criminal Status: [active3.fields["criminal"]]" @@ -418,7 +417,7 @@ Code: menu += "
" if (47) //quartermaster order records - menu = "
Supply Record Interlink
"
+ menu = "[PDAIMG(crate)] Supply Record Interlink
" menu += "Supply shuttle
" menu += "Location: " @@ -449,7 +448,7 @@ Code: menu += "Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management." if (49) //janitorial locator - menu = "
Persistent Custodial Object Locator
"
+ menu = "[PDAIMG(bucket)] Persistent Custodial Object Locator
" var/turf/cl = get_turf(src) if (cl) @@ -511,7 +510,7 @@ Code: menu += "Refresh GPS Locator" if (53) // Newscaster - menu = "
Newscaster Access
"
+ menu = "[PDAIMG(notes)] Newscaster Access
" menu += "Current Newsfeed: [current_channel ? current_channel : "None"]
" var/datum/newscaster/feed_channel/current for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels) @@ -533,7 +532,7 @@ Code: menu += "
Post Message" if (54) // Beepsky, Medibot, Floorbot, and Cleanbot access - menu = "
Bots Interlink
"
+ menu = "[PDAIMG(medbot)] Bots Interlink
" bot_control() if (99) //Newscaster message permission error menu = "ERROR : NOT AUTHORIZED [host_pda.id ? "" : "- ID SLOT EMPTY"]
" @@ -652,7 +651,7 @@ Code: var/mob/living/simple_animal/bot/Bot if(active_bot) - menu += "[active_bot]Status: (
refresh)" + menu += "[active_bot]
Status: ([PDAIMG(refresh)]refresh)
" menu += "Model: [active_bot.model]
" menu += "Location: [get_area(active_bot)]
" menu += "Mode: [active_bot.get_mode()]" @@ -688,9 +687,9 @@ Code: menu += "\[Summon Bot\]
" //summon menu += "Keep an ID inserted to upload access codes upon summoning." - menu += "
Return to bot list"
+ menu += "[PDAIMG(back)]Return to bot list" else - menu += "
Scan for active bots" + menu += "
[PDAIMG(refresh)]Scan for active bots
" var/turf/current_turf = get_turf(src) var/zlevel = current_turf.z var/botcount = 0 diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 90168711b6..1b4bb55f99 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -131,17 +131,17 @@ update_icon() to_chat(user, "[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].") -/obj/item/geiger_counter/attack(mob/living/M, mob/user) +/obj/item/geiger_counter/afterattack(atom/target, mob/user) if(user.a_intent == INTENT_HELP) if(!(obj_flags & EMAGGED)) - user.visible_message("[user] scans [M] with [src].", "You scan [M]'s radiation levels with [src]...") - addtimer(CALLBACK(src, .proc/scan, M, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents + user.visible_message("[user] scans [target] with [src].", "You scan [target]'s radiation levels with [src]...") + addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents else - user.visible_message("[user] scans [M] with [src].", "You project [src]'s stored radiation into [M]'s body!") - M.rad_act(radiation_count) + user.visible_message("[user] scans [target] with [src].", "You project [src]'s stored radiation into [target]!") + target.rad_act(radiation_count) radiation_count = 0 - return 1 - ..() + return TRUE + return ..() /obj/item/geiger_counter/proc/scan(atom/A, mob/user) var/rad_strength = 0 @@ -161,9 +161,9 @@ to_chat(user, "[icon2html(src, user)] Subject is irradiated. Radiation levels: [M.radiation].") if(rad_strength) - to_chat(user, "[icon2html(src, user)] Subject has irradiated objects on them. Radioactive strength: [rad_strength]") + to_chat(user, "[icon2html(src, user)] Target contains radioactive contamination. Radioactive strength: [rad_strength]") else - to_chat(user, "[icon2html(src, user)] Subject is free of radioactive contamination.") + to_chat(user, "[icon2html(src, user)] Target is free of radioactive contamination.") /obj/item/geiger_counter/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver) && (obj_flags & EMAGGED)) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 715d991080..332b73c688 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -174,7 +174,7 @@ GAS ANALYZER trauma_desc += B.scan_desc trauma_text += trauma_desc to_chat(user, "\tCerebral traumas detected: subjects appears to be suffering from [english_list(trauma_text)].") - if(C.roundstart_traits.len) + if(C.roundstart_quirks.len) to_chat(user, "\tSubject has the following physiological traits: [C.get_trait_string()].") if(advanced) to_chat(user, "\tBrain Activity Level: [(200 - M.getBrainLoss())/2]%.") diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 35994d09f5..12d263bf9d 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -58,6 +58,36 @@ attacher = user return +//Attached device memes +/obj/item/transfer_valve/Move() + . = ..() + if(attached_device) + attached_device.holder_movement() + +/obj/item/transfer_valve/dropped() + . = ..() + if(attached_device) + attached_device.dropped() + +/obj/item/transfer_valve/on_found(mob/finder) + if(attached_device) + attached_device.on_found(finder) + +/obj/item/transfer_valve/Crossed(atom/movable/AM as mob|obj) + . = ..() + if(attached_device) + attached_device.Crossed(AM) + +/obj/item/transfer_valve/attack_hand()//Triggers mousetraps + . = ..() + if(.) + return + if(attached_device) + attached_device.attack_hand() + +//These keep attached devices synced up, for example a TTV with a mouse trap being found in a bag so it's triggered, or moving the TTV with an infrared beam sensor to update the beam's direction. + + /obj/item/transfer_valve/attack_self(mob/user) user.set_machine(src) var/dat = {" Valve properties: @@ -91,8 +121,7 @@ toggle_valve() else if(attached_device) if(href_list["rem_device"]) - attached_device.forceMove(drop_location()) - attached_device.holder = null + attached_device.on_detach() attached_device = null update_icon() if(href_list["device"]) @@ -127,6 +156,10 @@ underlays += J if(attached_device) add_overlay("device") + if(istype(attached_device, /obj/item/assembly/infra)) + var/obj/item/assembly/infra/sensor = attached_device + if(sensor.on && sensor.visible) + add_overlay("proxy_beam") /obj/item/transfer_valve/proc/merge_gases() tank_two.air_contents.volume += tank_one.air_contents.volume diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 3ca17b01af..1fc61985b5 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -87,7 +87,7 @@ return FALSE var/turf/there = get_turf(H) - return (H.z != 0 || (there && there.z == H.z)) + return (H.z != 0 || (there && there.z == here.z)) return FALSE diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index fb55d92301..d6bb54bddf 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -45,6 +45,11 @@ lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' +/obj/item/shield/riot/roman/fake + desc = "Bears an inscription on the inside: \"Romanes venio domus\". It appears to be a bit flimsy." + block_chance = 0 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + /obj/item/shield/riot/buckler name = "wooden buckler" desc = "A medieval wooden buckler." diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 511f9754fe..bee37d1ff9 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -127,6 +127,18 @@ self_delay = 20 max_amount = 12 +/obj/item/stack/medical/gauze/wirecutter_act(mob/living/user, obj/item/I) + if(get_amount() < 2) + to_chat(user, "You need at least two gauze to do this!") + return + new /obj/item/stack/sheet/cloth(user.drop_location()) + user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \ + "You cut [src] into pieces of cloth with [I].", \ + "You hear cutting.") + var/obj/item/stack/medical/gauze/R = src + src = null + R.use(2) + /obj/item/stack/medical/gauze/suicide_act(mob/living/user) user.visible_message("[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!") return OXYLOSS @@ -155,5 +167,5 @@ grind_results = list("silver_sulfadiazine" = 10) /obj/item/stack/medical/ointment/suicide_act(mob/living/user) - user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! Don't they know that stuff is toxic?") - return TOXLOSS \ No newline at end of file + user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") + return TOXLOSS diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 9d32504c19..3264deae88 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ singular_name = "plasma glass sheet" icon_state = "sheet-pglass" item_state = "sheet-pglass" - materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plasmaglass @@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" item_state = "sheet-rglass" - materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/rglass @@ -175,7 +175,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \ singular_name = "reinforced plasma glass sheet" icon_state = "sheet-prglass" item_state = "sheet-prglass" - materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT, MAT_METAL = MINERAL_MATERIAL_AMOUNT * 0.5,) armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plasmarglass @@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( singular_name = "titanium glass sheet" icon_state = "sheet-titaniumglass" item_state = "sheet-titaniumglass" - materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/titaniumglass @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( singular_name = "plastitanium glass sheet" icon_state = "sheet-plastitaniumglass" item_state = "sheet-plastitaniumglass" - materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plastitaniumglass diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index cfccedcc3a..4eae35a98c 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -211,10 +211,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ if(W.is_sharp()) playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") - if(do_after(user,50, target = src)) + if(do_after(user, 50, target = src)) to_chat(user, "You cut the hair from this [src.singular_name].") - var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc) - HS.amount = 1 + new /obj/item/stack/sheet/hairlesshide(user.drop_location(), 1) use(1) else return ..() @@ -228,21 +227,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ if(exposed_temperature >= drying_threshold_temperature) wetness-- if(wetness == 0) - //Try locating an exisitng stack on the tile and add to there if possible - for(var/obj/item/stack/sheet/leather/HS in src.loc) - if(HS.amount < 50) - HS.amount++ - src.use(1) - wetness = initial(wetness) - break - //If it gets to here it means it did not find a suitable stack on the tile. - var/obj/item/stack/sheet/leather/HS = new(src.loc) - HS.amount = 1 + new /obj/item/stack/sheet/leather(drop_location(), 1) wetness = initial(wetness) - src.use(1) + use(1) /obj/item/stack/sheet/wetleather/microwave_act(obj/machinery/microwave/MW) ..() - var/obj/item/stack/sheet/leather/L = new(loc) - L.amount = amount + new /obj/item/stack/sheet/leather(drop_location(), amount) qdel(src) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index b4482a72db..b7c2d5b3f9 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -14,13 +14,12 @@ grind_results = list("silicon" = 20, "copper" = 5) /obj/item/stack/light_w/attackby(obj/item/O, mob/user, params) - + var/atom/Tsec = user.drop_location() if(istype(O, /obj/item/wirecutters)) - var/obj/item/stack/cable_coil/CC = new (user.loc) - CC.amount = 5 + var/obj/item/stack/cable_coil/CC = new (Tsec, 5) CC.add_fingerprint(user) amount-- - var/obj/item/stack/sheet/glass/G = new (user.loc) + var/obj/item/stack/sheet/glass/G = new (Tsec) G.add_fingerprint(user) if(amount <= 0) qdel(src) @@ -28,7 +27,6 @@ else if(istype(O, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = O if (M.use(1)) - use(1) var/obj/item/L = new /obj/item/stack/tile/light(user.loc) to_chat(user, "You make a light tile.") L.add_fingerprint(user) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 6109f6b0d0..b3af8b9b33 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -121,6 +121,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ /obj/item/stack/sheet/metal/twenty amount = 20 +/obj/item/stack/sheet/metal/ten + amount = 10 + /obj/item/stack/sheet/metal/five amount = 5 diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e67efb0c8a..4d5bf2a449 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -33,10 +33,13 @@ return return TRUE -/obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE) +/obj/item/stack/Initialize(mapload, new_amount, merge = TRUE) . = ..() - if(new_amount) + if(new_amount != null) amount = new_amount + while(amount > max_amount) + amount -= max_amount + new type(loc, max_amount, FALSE) if(!merge_type) merge_type = type if(merge) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index a6f450d332..9a2e62c9f2 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -453,7 +453,7 @@ /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun/PopulateContents() for(var/i in 1 to 6) new /obj/item/ammo_box/magazine/m12g(src) - new /obj/item/ammo_box/magazine/m12g/buckshot(src) + new /obj/item/ammo_box/magazine/m12g/stun(src) new /obj/item/ammo_box/magazine/m12g/slug(src) new /obj/item/ammo_box/magazine/m12g/dragon(src) @@ -479,7 +479,7 @@ /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle/PopulateContents() new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/gun/ballistic/automatic/shotgun/bulldog(src) - new /obj/item/ammo_box/magazine/m12g/buckshot(src) + new /obj/item/ammo_box/magazine/m12g/stun(src) new /obj/item/clothing/glasses/thermal/syndi(src) /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index ec92961387..05d6338235 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -111,8 +111,8 @@ new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc new /obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc new /obj/item/implanter/explosive(src) // 2 tc - new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc - new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc + new /obj/item/ammo_box/magazine/m12g(src) // 2 tc + new /obj/item/ammo_box/magazine/m12g(src) // 2 tc new /obj/item/grenade/plastic/c4 (src) // 1 tc new /obj/item/grenade/plastic/c4 (src) // 1 tc new /obj/item/card/emag(src) // 6 tc diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 0b1c2fba5c..b8eb2dcc00 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -49,7 +49,6 @@ on = FALSE to_chat(user, "You need a free hand to hold the mister!") return - noz.forceMove(user) else //Remove from their hands and put back "into" the tank remove_noz() diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index cc7e3249d4..dc6fbfe25b 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -219,3 +219,17 @@ if(active_portal_pairs[i] == P) return DESTINATION_PORTAL return FALSE + +/obj/item/hand_tele/suicide_act(mob/user) + if(iscarbon(user)) + user.visible_message("[user] is creating a weak portal and sticking [user.p_their()] head through! It looks like [user.p_theyre()] trying to commit suicide!") + var/mob/living/carbon/itemUser = user + var/obj/item/bodypart/head/head = itemUser.get_bodypart(BODY_ZONE_HEAD) + if(head) + head.drop_limb() + var/list/safeLevels = SSmapping.levels_by_any_trait(list(ZTRAIT_SPACE_RUINS, ZTRAIT_LAVA_RUINS, ZTRAIT_STATION, ZTRAIT_MINING)) + head.forceMove(locate(rand(1, world.maxx), rand(1, world.maxy), pick(safeLevels))) + itemUser.visible_message("The portal snaps closed taking [user]'s head with it!") + else + itemUser.visible_message("[user] looks even further depressed as they realize they do not have a head...and suddenly dies of shame!") + return (BRUTELOSS) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index bd8dc23580..a2fcba3701 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -840,7 +840,7 @@ name = "card" desc = "a card" icon = 'icons/obj/toy.dmi' - icon_state = "singlecard_nanotrasen_down" + icon_state = "singlecard_down_nanotrasen" w_class = WEIGHT_CLASS_TINY var/cardname = null var/flipped = 0 diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 1e76bc7160..2dadafe2cf 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -1,6 +1,9 @@ //the essential proc to call when an obj must receive damage of any kind. /obj/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if(QDELETED(src)) + stack_trace("[src] taking damage after deletion") + return if(sound_effect) play_attack_sound(damage_amount, damage_type, damage_flag) if(!(resistance_flags & INDESTRUCTIBLE) && obj_integrity > 0) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 0a6dfaa1cf..ed797e4256 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -147,8 +147,7 @@ to_chat(user, "You remove the cables.") state = SCREWED_CORE update_icon() - var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) - A.amount = 5 + new /obj/item/stack/cable_coil(drop_location(), 5) return if(istype(P, /obj/item/stack/sheet/rglass)) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index b758b33355..ecfd0ba0c7 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -53,7 +53,7 @@ name = "resin" desc = "Looks like some kind of thick resin." icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi' - icon_state = "resin" + icon_state = "smooth" density = TRUE opacity = 1 anchored = TRUE @@ -77,7 +77,7 @@ name = "resin wall" desc = "Thick resin solidified into a wall." icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi' - icon_state = "wall0" //same as resin, but consistency ho! + icon_state = "smooth" //same as resin, but consistency ho! resintype = "wall" canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane) @@ -88,7 +88,7 @@ name = "resin membrane" desc = "Resin just thin enough to let light pass through." icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi' - icon_state = "membrane0" + icon_state = "smooth" opacity = 0 max_integrity = 160 resintype = "membrane" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9f95e71e7f..95deb52eb4 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -86,31 +86,31 @@ /obj/structure/closet/CanPass(atom/movable/mover, turf/target) if(wall_mounted) - return 1 + return TRUE return !density /obj/structure/closet/proc/can_open(mob/living/user) if(welded || locked) - return 0 + return FALSE var/turf/T = get_turf(src) for(var/mob/living/L in T) if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) if(user) to_chat(user, "There's something large on top of [src], preventing it from opening." ) - return 0 - return 1 + return FALSE + return TRUE /obj/structure/closet/proc/can_close(mob/living/user) var/turf/T = get_turf(src) for(var/obj/structure/closet/closet in T) if(closet != src && !closet.wall_mounted) - return 0 + return FALSE for(var/mob/living/L in T) if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) if(user) to_chat(user, "There's something too large in [src], preventing it from closing.") - return 0 - return 1 + return FALSE + return TRUE /obj/structure/closet/proc/dump_contents() var/atom/L = drop_location() @@ -180,14 +180,14 @@ /obj/structure/closet/proc/close(mob/living/user) if(!opened || !can_close(user)) - return 0 + return FALSE take_contents() playsound(loc, close_sound, 15, 1, -3) climb_time = initial(climb_time) opened = FALSE density = TRUE update_icon() - return 1 + return TRUE /obj/structure/closet/proc/toggle(mob/living/user) if(opened) @@ -388,7 +388,7 @@ /obj/structure/closet/proc/bust_open() welded = FALSE //applies to all lockers locked = FALSE //applies to critter crates and secure lockers only - broken = 1 //applies to secure lockers only + broken = TRUE //applies to secure lockers only open() /obj/structure/closet/AltClick(mob/user) @@ -427,7 +427,7 @@ "You scramble [src]'s lock, breaking it open!", "You hear a faint electrical spark.") playsound(src, "sparks", 50, 1) - broken = 1 + broken = TRUE locked = FALSE update_icon() @@ -470,16 +470,17 @@ /obj/structure/closet/proc/dive_into(mob/living/user) var/turf/T1 = get_turf(user) var/turf/T2 = get_turf(src) - if(!open() && !opened) - togglelock(user, TRUE) - if(!open()) + if(!opened) + if(locked) + togglelock(user, TRUE) + if(!open(user)) to_chat(user, "It won't budge!") return step_towards(user, T2) T1 = get_turf(user) if(T1 == T2) user.resting = TRUE //so people can jump into crates without slamming the lid on their head - if(!close()) + if(!close(user)) to_chat(user, "You can't get [src] to close!") user.resting = FALSE return diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index eb7e7a3f93..90863441a2 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -148,6 +148,8 @@ new /obj/item/storage/backpack/duffelbag/sec(src) for(var/i in 1 to 3) new /obj/item/clothing/under/rank/security(src) + for(var/i in 1 to 2) + new /obj/item/clothing/under/rank/security/skirt(src) for(var/i in 1 to 3) new /obj/item/clothing/shoes/jackboots(src) for(var/i in 1 to 3) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm index 8a25e831f0..2fcf670101 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm @@ -17,6 +17,7 @@ armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) anchored = TRUE anchorable = FALSE + var/generated = FALSE var/datum/supply_order/SupplyOrder /obj/structure/closet/supplypod/bluespacepod @@ -45,7 +46,9 @@ /obj/structure/closet/supplypod/open() var/turf/T = get_turf(src) opened = TRUE - SupplyOrder.generate(T)//not called during populateContents as supplyorder generation requires a turf + if(!generated) + generated = TRUE + SupplyOrder.generate(T)//not called during populateContents as supplyorder generation requires a turf update_icon() playsound(src, open_sound, 15, 1, -3) if(istype(src,/obj/structure/closet/supplypod/bluespacepod)) @@ -62,6 +65,7 @@ //------------------------------------FALLING SUPPLY POD-------------------------------------// /obj/effect/temp_visual/DPfall icon = 'icons/obj/2x2.dmi' + icon_state = "supplypod_falling" pixel_x = -16 pixel_y = -5 pixel_z = 200 @@ -115,4 +119,4 @@ icon = 'icons/obj/module.dmi' icon_state = "cargodisk" item_state = "card-id" - w_class = WEIGHT_CLASS_SMALL \ No newline at end of file + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 2214869098..3edbde93b7 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -1,115 +1,115 @@ -/obj/structure/closet/syndicate - name = "armory closet" - desc = "Why is this here?" - icon_state = "syndicate" - -/obj/structure/closet/syndicate/personal - desc = "It's a personal storage unit for operative gear." - -/obj/structure/closet/syndicate/personal/PopulateContents() - ..() - new /obj/item/clothing/under/syndicate(src) - new /obj/item/clothing/shoes/sneakers/black(src) - new /obj/item/radio/headset/syndicate(src) - new /obj/item/ammo_box/magazine/m10mm(src) - new /obj/item/storage/belt/military(src) - new /obj/item/crowbar/red(src) - new /obj/item/clothing/glasses/night(src) - -/obj/structure/closet/syndicate/nuclear - desc = "It's a storage unit for a Syndicate boarding party." - -/obj/structure/closet/syndicate/nuclear/PopulateContents() - for(var/i in 1 to 5) - new /obj/item/ammo_box/magazine/m10mm(src) - new /obj/item/storage/box/flashbangs(src) - new /obj/item/storage/box/teargas(src) - new /obj/item/storage/backpack/duffelbag/syndie/med(src) - new /obj/item/pda/syndicate(src) - -/obj/structure/closet/syndicate/resources - desc = "An old, dusty locker." - -/obj/structure/closet/syndicate/resources/PopulateContents() - ..() - var/common_min = 30 //Minimum amount of minerals in the stack for common minerals - var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals - var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals - var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK - - - var/pickednum = rand(1, 50) - - //Sad trombone - if(pickednum == 1) - var/obj/item/paper/P = new /obj/item/paper(src) - P.name = "\improper IOU" - P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!" - - //Metal (common ore) - if(pickednum >= 2) - new /obj/item/stack/sheet/metal(src, rand(common_min, common_max)) - - //Glass (common ore) - if(pickednum >= 5) - new /obj/item/stack/sheet/glass(src, rand(common_min, common_max)) - - //Plasteel (common ore) Because it has a million more uses then plasma - if(pickednum >= 10) - new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max)) - - //Plasma (rare ore) - if(pickednum >= 15) - new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max)) - - //Silver (rare ore) - if(pickednum >= 20) - new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max)) - - //Gold (rare ore) - if(pickednum >= 30) - new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max)) - - //Uranium (rare ore) - if(pickednum >= 40) - new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max)) - - //Titanium (rare ore) - if(pickednum >= 40) - new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max)) - - //Plastitanium (rare ore) - if(pickednum >= 40) - new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max)) - - //Diamond (rare HONK) - if(pickednum >= 45) - new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max)) - - //Jetpack (You hit the jackpot!) - if(pickednum == 50) - new /obj/item/tank/jetpack/carbondioxide(src) - -/obj/structure/closet/syndicate/resources/everything - desc = "It's an emergency storage closet for repairs." - -/obj/structure/closet/syndicate/resources/everything/PopulateContents() - var/list/resources = list( - /obj/item/stack/sheet/metal, - /obj/item/stack/sheet/glass, - /obj/item/stack/sheet/mineral/gold, - /obj/item/stack/sheet/mineral/silver, - /obj/item/stack/sheet/mineral/plasma, - /obj/item/stack/sheet/mineral/uranium, - /obj/item/stack/sheet/mineral/diamond, - /obj/item/stack/sheet/mineral/bananium, - /obj/item/stack/sheet/plasteel, - /obj/item/stack/sheet/mineral/titanium, - /obj/item/stack/sheet/mineral/plastitanium, - /obj/item/stack/rods - ) - - for(var/i = 0, i<2, i++) - for(var/res in resources) - var/obj/item/stack/R = new res(src) - R.amount = R.max_amount +/obj/structure/closet/syndicate + name = "armory closet" + desc = "Why is this here?" + icon_state = "syndicate" + +/obj/structure/closet/syndicate/personal + desc = "It's a personal storage unit for operative gear." + +/obj/structure/closet/syndicate/personal/PopulateContents() + ..() + new /obj/item/clothing/under/syndicate(src) + new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/radio/headset/syndicate(src) + new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/storage/belt/military(src) + new /obj/item/crowbar/red(src) + new /obj/item/clothing/glasses/night(src) + +/obj/structure/closet/syndicate/nuclear + desc = "It's a storage unit for a Syndicate boarding party." + +/obj/structure/closet/syndicate/nuclear/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/storage/box/flashbangs(src) + new /obj/item/storage/box/teargas(src) + new /obj/item/storage/backpack/duffelbag/syndie/med(src) + new /obj/item/pda/syndicate(src) + +/obj/structure/closet/syndicate/resources + desc = "An old, dusty locker." + +/obj/structure/closet/syndicate/resources/PopulateContents() + ..() + var/common_min = 30 //Minimum amount of minerals in the stack for common minerals + var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals + var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals + var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK + + + var/pickednum = rand(1, 50) + + //Sad trombone + if(pickednum == 1) + var/obj/item/paper/P = new /obj/item/paper(src) + P.name = "\improper IOU" + P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!" + + //Metal (common ore) + if(pickednum >= 2) + new /obj/item/stack/sheet/metal(src, rand(common_min, common_max)) + + //Glass (common ore) + if(pickednum >= 5) + new /obj/item/stack/sheet/glass(src, rand(common_min, common_max)) + + //Plasteel (common ore) Because it has a million more uses then plasma + if(pickednum >= 10) + new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max)) + + //Plasma (rare ore) + if(pickednum >= 15) + new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max)) + + //Silver (rare ore) + if(pickednum >= 20) + new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max)) + + //Gold (rare ore) + if(pickednum >= 30) + new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max)) + + //Uranium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max)) + + //Titanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max)) + + //Plastitanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max)) + + //Diamond (rare HONK) + if(pickednum >= 45) + new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max)) + + //Jetpack (You hit the jackpot!) + if(pickednum == 50) + new /obj/item/tank/jetpack/carbondioxide(src) + +/obj/structure/closet/syndicate/resources/everything + desc = "It's an emergency storage closet for repairs." + +/obj/structure/closet/syndicate/resources/everything/PopulateContents() + var/list/resources = list( + /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/glass, + /obj/item/stack/sheet/mineral/gold, + /obj/item/stack/sheet/mineral/silver, + /obj/item/stack/sheet/mineral/plasma, + /obj/item/stack/sheet/mineral/uranium, + /obj/item/stack/sheet/mineral/diamond, + /obj/item/stack/sheet/mineral/bananium, + /obj/item/stack/sheet/plasteel, + /obj/item/stack/sheet/mineral/titanium, + /obj/item/stack/sheet/mineral/plastitanium, + /obj/item/stack/rods + ) + + for(var/i = 0, i<2, i++) + for(var/res in resources) + var/obj/item/stack/R = res + new res(src, initial(R.max_amount)) diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 7098520ef5..6c8feae50b 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -1,15 +1,14 @@ /obj/structure/closet/crate/large name = "large crate" - desc = "A hefty wooden crate." + desc = "A hefty wooden crate. You'll need a crowbar to get it open." icon_state = "largecrate" density = TRUE material_drop = /obj/item/stack/sheet/mineral/wood + material_drop_amount = 4 delivery_icon = "deliverybox" + integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite. /obj/structure/closet/crate/large/attack_hand(mob/user) - . = ..() - if(.) - return add_fingerprint(user) if(manifest) tear_manifest(user) @@ -18,7 +17,6 @@ /obj/structure/closet/crate/large/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/crowbar)) - var/turf/T = get_turf(src) if(manifest) tear_manifest(user) @@ -27,11 +25,19 @@ "You hear splitting wood.") playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1) - for(var/i in 1 to rand(2, 5)) + var/turf/T = get_turf(src) + for(var/i in 1 to material_drop_amount) new material_drop(src) for(var/atom/movable/AM in contents) AM.forceMove(T) qdel(src) + else - return ..() + if(user.a_intent == INTENT_HARM) //Only return ..() if intent is harm, otherwise return 0 or just end it. + return ..() //Stops it from opening and turning invisible when items are used on it. + + else + to_chat(user, "You need a crowbar to pry this open!") + return FALSE //Just stop. Do nothing. Don't turn into an invisible sprite. Don't open like a locker. + //The large crate has no non-attack interactions other than the crowbar, anyway. \ No newline at end of file diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index f1fbd1febd..5aa88cb0d9 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -263,12 +263,14 @@ /obj/structure/grille/hitby(AM as mob|obj) if(isobj(AM)) if(prob(50) && anchored && !broken) - var/turf/T = get_turf(src) - var/obj/structure/cable/C = T.get_cable_node() - if(C) - playsound(src, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) - tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. - C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. + var/obj/O = AM + if(O.throwforce != 0)//don't want to let people spam tesla bolts, this way it will break after time + var/turf/T = get_turf(src) + var/obj/structure/cable/C = T.get_cable_node() + if(C) + playsound(src, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) + tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. + C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() /obj/structure/grille/get_dumping_location(datum/component/storage/source,mob/user) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index c6273f3049..40435c2000 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -8,6 +8,7 @@ armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) max_integrity = 50 layer = LATTICE_LAYER //under pipes + plane = FLOOR_PLANE var/number_of_rods = 1 canSmoothWith = list(/obj/structure/lattice, /turf/open/floor, diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 02df5ed3fb..2fc582229d 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -1,4 +1,5 @@ /turf/open + plane = FLOOR_PLANE var/slowdown = 0 //negative for faster, positive for slower var/mutable_appearance/wet_overlay diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 1e96cc507e..0136efc3b3 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -95,7 +95,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/Getmob(mob/M in GLOB.mob_list) +/client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list) set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 54614cf8ef..2fc616d588 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -27,7 +27,7 @@ if(isnewplayer(M)) continue if (M.stat == DEAD || (M.client && M.client.holder && (M.client.prefs.chat_toggles & CHAT_DEAD))) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above - M.show_message(rendered, 2) + to_chat(M, rendered) SSblackbox.record_feedback("tally", "admin_verb", 1, "Dsay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index cb69d395b4..f54d88fc49 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -151,6 +151,7 @@ desc = "You get the feeling that you shouldn't be standing here." clockwork_desc = "A sigil that will soon erupt and smite any unenlightened nearby." icon = 'icons/effects/96x96.dmi' + icon_state = "" pixel_x = -32 pixel_y = -32 layer = BELOW_MOB_LAYER diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index a1c16aa078..35399dc8e0 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -33,10 +33,8 @@ desc = "A sword humming with unholy energy. It glows with a dim red light." icon_state = "cultblade" item_state = "cultblade" - lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' - righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' - inhand_x_dimension = 64 - inhand_y_dimension = 64 + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' flags_1 = CONDUCT_1 sharpness = IS_SHARP w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 69e6af14bf..a1241d5998 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -708,6 +708,11 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Summon Cultist rune failed - target died") return + if(cultist_to_summon.pulledby || cultist_to_summon.buckled) + to_chat(user, "[cultist_to_summon] is being held in place!") + fail_invoke() + log_game("Summon Cultist rune failed - target restrained") + return if(!iscultist(cultist_to_summon)) to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!") fail_invoke() diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index 3ddbd0117c..6572584eab 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -190,7 +190,7 @@ return ..() /mob/living/simple_animal/hostile/morph/AttackingTarget() - if(!melee_damage_disguised) + if(morphed && !melee_damage_disguised) to_chat(src, "You can not attack while disguised!") return if(isliving(target)) //Eat Corpses to regen health diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 0e588c4380..a9c6a112bd 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -501,16 +501,37 @@ This is here to make the tiles around the station mininuke change when it's arme armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/fake = FALSE + var/turf/lastlocation + var/last_disk_move /obj/item/disk/nuclear/Initialize() . = ..() if(!fake) GLOB.poi_list |= src + last_disk_move = world.time + START_PROCESSING(SSobj, src) /obj/item/disk/nuclear/ComponentInitialize() . = ..() AddComponent(/datum/component/stationloving, !fake) +/obj/item/disk/nuclear/process() + if(fake) + STOP_PROCESSING(SSobj, src) + CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") + var/turf/newturf = get_turf(src) + if(newturf && lastlocation == newturf) + if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.00001)) + var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control + if(istype(loneop)) + loneop.weight += 1 + else + lastlocation = newturf + last_disk_move = world.time + var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control + if(istype(loneop) && prob(loneop.weight)) + loneop.weight = max(loneop.weight - 1, 0) + /obj/item/disk/nuclear/examine(mob/user) . = ..() if(!fake) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 9457e3a8c8..aea9a1862a 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -66,7 +66,7 @@ name = "pile of viscera" desc = "A repulsive pile of guts and gore." gender = NEUTER - random_icon_states = list("innards") + icon_state = "innards" /mob/living/simple_animal/slaughter/phasein() . = ..() diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 4d6887f3e8..3ea2e1d739 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -493,10 +493,10 @@ D.pixel_z = target.pixel_z if(do_mob(src, target, 100)) to_chat(src, "Dismantling complete.") - var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) - M.amount = 5 + var/atom/Tsec = target.drop_location() + new /obj/item/stack/sheet/metal(Tsec, 5) for(var/obj/item/I in target.component_parts) - I.forceMove(M.drop_location()) + I.forceMove(Tsec) var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target)) N.pixel_x = target.pixel_x N.pixel_y = target.pixel_y @@ -505,7 +505,7 @@ if(istype(target, /obj/machinery/computer)) var/obj/machinery/computer/C = target if(C.circuit) - C.circuit.forceMove(M.drop_location()) + C.circuit.forceMove(Tsec) qdel(target) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 85d45bd40b..3e291d0eee 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -3,6 +3,7 @@ #define WIRE_PULSE_SPECIAL (1<<2) #define WIRE_RADIO_RECEIVE (1<<3) #define WIRE_RADIO_PULSE (1<<4) +#define ASSEMBLY_BEEP_VOLUME 5 /obj/item/assembly name = "assembly" @@ -16,6 +17,8 @@ throw_speed = 3 throw_range = 7 + var/is_position_sensitive = FALSE //set to true if the device has different icons for each position. + //This will prevent things such as visible lasers from facing the incorrect direction when transformed by assembly_holder's update_icon() var/secured = TRUE var/list/attached_overlays = null var/obj/item/assembly_holder/holder = null @@ -30,14 +33,18 @@ /obj/item/assembly/proc/on_attach() -/obj/item/assembly/proc/on_detach() +/obj/item/assembly/proc/on_detach() //call this when detaching it from a device. handles any special functions that need to be updated ex post facto + if(!holder) + return FALSE + forceMove(holder.drop_location()) + holder = null + return TRUE /obj/item/assembly/proc/holder_movement() //Called when the holder is moved - return - -/obj/item/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc) - return "The trigger assembly looks broken!" - + if(!holder) + return FALSE + setDir(holder.dir) + return TRUE /obj/item/assembly/proc/is_secured(mob/user) if(!secured) @@ -47,7 +54,7 @@ //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs -/obj/item/assembly/proc/pulsed(radio = 0) +/obj/item/assembly/proc/pulsed(radio = FALSE) if(wire_type & WIRE_RECEIVE) INVOKE_ASYNC(src, .proc/activate) if(radio && (wire_type & WIRE_RADIO_RECEIVE)) @@ -56,7 +63,7 @@ //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct -/obj/item/assembly/proc/pulse(radio = 0) +/obj/item/assembly/proc/pulse(radio = FALSE) if(connected && wire_type) connected.pulse_assembly(src) return TRUE @@ -91,21 +98,19 @@ else to_chat(user, "Both devices must be in attachable mode to be attached together.") return - if(istype(W, /obj/item/screwdriver)) - if(toggle_secure()) - to_chat(user, "\The [src] is ready!") - else - to_chat(user, "\The [src] can now be attached!") - return ..() +/obj/item/assembly/screwdriver_act(mob/living/user, obj/item/I) + if(toggle_secure()) + to_chat(user, "\The [src] is ready!") + else + to_chat(user, "\The [src] can now be attached!") + add_fingerprint(user) + return TRUE /obj/item/assembly/examine(mob/user) ..() - if(secured) - to_chat(user, "\The [src] is secured and ready to be used.") - else - to_chat(user, "\The [src] can be attached to other things.") + to_chat(user, "\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]") /obj/item/assembly/attack_self(mob/user) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index daca7a5435..ca85255bf0 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -13,11 +13,14 @@ var/obj/item/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank +/obj/item/onetankbomb/IsSpecialAssembly() + return TRUE /obj/item/onetankbomb/examine(mob/user) bombtank.examine(user) /obj/item/onetankbomb/update_icon() + cut_overlays() if(bombtank) icon = bombtank.icon icon_state = bombtank.icon_state @@ -30,29 +33,37 @@ if(istype(W, /obj/item/analyzer)) bombtank.attackby(W, user) return - if(istype(W, /obj/item/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works. - - to_chat(user, "You disassemble [src].") + add_fingerprint(user) + ..() +/obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I) + to_chat(user, "You disassemble [src]!") + if(bombassembly) bombassembly.forceMove(drop_location()) bombassembly.master = null bombassembly = null - + if(bombtank) bombtank.forceMove(drop_location()) bombtank.master = null bombtank = null + qdel(src) + return TRUE - qdel(src) +/obj/item/onetankbomb/welder_act(mob/living/user, obj/item/I) + . = FALSE + if(status) + to_chat(user, "[bombtank] already has a pressure hole!") return - var/obj/item/weldingtool/WT = W - if((istype(WT) && WT.welding)) - if(!status) - status = TRUE - GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]" - message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]") - to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") - add_fingerprint(user) - ..() + if(!I.tool_start_check(user, amount=0)) + return + if(I.use_tool(src, user, 0, volume=40)) + status = TRUE + GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]" + message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]") + to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") + add_fingerprint(user) + return TRUE + /obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly bombassembly.attack_self(user, TRUE) @@ -60,16 +71,20 @@ return /obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. - visible_message("[icon2html(src, viewers(src))] *beep* *beep*", "*beep* *beep*") + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) sleep(10) - if(!src) + if(QDELETED(src)) return if(status) bombtank.ignite() //if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file else bombtank.release() +//Assembly / attached device memes + /obj/item/onetankbomb/Crossed(atom/movable/AM as mob|obj) //for mousetraps + . = ..() if(bombassembly) bombassembly.Crossed(AM) @@ -77,6 +92,26 @@ if(bombassembly) bombassembly.on_found(finder) +/obj/item/onetankbomb/attack_hand() //also for mousetraps + . = ..() + if(.) + return + if(bombassembly) + bombassembly.attack_hand() + +/obj/item/onetankbomb/Move() + . = ..() + if(bombassembly) + bombassembly.setDir(dir) + bombassembly.Move() + +/obj/item/onetankbomb/dropped() + . = ..() + if(bombassembly) + bombassembly.dropped() + + + // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ---------- diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index c3475b1839..f320872076 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -2,10 +2,10 @@ name = "blast door controller" desc = "A small electronic device able to control a blast door remotely." icon_state = "control" - attachable = 1 + attachable = TRUE var/id = null var/can_change_id = 0 - var/cooldown = 0//Door cooldowns + var/cooldown = FALSE //Door cooldowns /obj/item/assembly/control/examine(mob/user) ..() @@ -13,15 +13,14 @@ to_chat(user, "Its channel ID is '[id]'.") /obj/item/assembly/control/activate() - cooldown = 1 + cooldown = TRUE var/openclose for(var/obj/machinery/door/poddoor/M in GLOB.machines) if(M.id == src.id) if(openclose == null) openclose = M.density INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close) - sleep(10) - cooldown = 0 + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) /obj/item/assembly/control/airlock @@ -38,7 +37,7 @@ */ /obj/item/assembly/control/airlock/activate() - cooldown = 1 + cooldown = TRUE var/doors_need_closing = FALSE var/list/obj/machinery/door/airlock/open_or_close = list() for(var/obj/machinery/door/airlock/D in GLOB.airlocks) @@ -66,8 +65,7 @@ for(var/D in open_or_close) INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open) - sleep(10) - cooldown = 0 + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) /obj/item/assembly/control/massdriver @@ -75,7 +73,7 @@ desc = "A small electronic device able to control a mass driver." /obj/item/assembly/control/massdriver/activate() - cooldown = 1 + cooldown = TRUE for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open) @@ -92,8 +90,7 @@ if (M.id == src.id) INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close) - sleep(10) - cooldown = 0 + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) /obj/item/assembly/control/igniter @@ -101,7 +98,7 @@ desc = "A remote controller for a mounted igniter." /obj/item/assembly/control/igniter/activate() - cooldown = 1 + cooldown = TRUE for(var/obj/machinery/sparker/M in GLOB.machines) if (M.id == src.id) INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite) @@ -112,22 +109,19 @@ M.on = !M.on M.icon_state = "igniter[M.on]" - sleep(30) - cooldown = 0 - + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 30) /obj/item/assembly/control/flasher name = "flasher controller" desc = "A remote controller for a mounted flasher." /obj/item/assembly/control/flasher/activate() - cooldown = 1 + cooldown = TRUE for(var/obj/machinery/flasher/M in GLOB.machines) if(M.id == src.id) INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash) - sleep(50) - cooldown = 0 + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) /obj/item/assembly/control/crematorium @@ -135,10 +129,9 @@ desc = "An evil-looking remote controller for a crematorium." /obj/item/assembly/control/crematorium/activate() - cooldown = 1 + cooldown = TRUE for (var/obj/structure/bodycontainer/crematorium/C in GLOB.crematoriums) if (C.id == id) C.cremate(usr) - sleep(50) - cooldown = 0 + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index de25b86d46..dceda9ab9d 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -93,7 +93,7 @@ if(crit_fail || (world.time < last_trigger + cooldown)) return FALSE last_trigger = world.time - playsound(src, 'sound/weapons/flash.ogg', 100, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) times_used++ flash_recharge() update_icon(TRUE) @@ -195,6 +195,8 @@ /obj/item/assembly/flash/cyborg/attackby(obj/item/W, mob/user, params) return +/obj/item/assembly/flash/cyborg/screwdriver_act(mob/living/user, obj/item/I) + return /obj/item/assembly/flash/memorizer name = "memorizer" @@ -226,7 +228,7 @@ return FALSE overheat = TRUE addtimer(CALLBACK(src, .proc/cooldown), flashcd) - playsound(src, 'sound/weapons/flash.ogg', 100, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) update_icon(1) return TRUE @@ -272,7 +274,7 @@ return crit_fail = FALSE times_used = 0 - playsound(src, 'sound/items/deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) update_icon() flash.crit_fail = TRUE flash.update_icon() diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 633db327bf..78d3f686ab 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -3,10 +3,10 @@ desc = "Used for scanning and monitoring health." icon_state = "health" materials = list(MAT_METAL=800, MAT_GLASS=200) - attachable = 1 - secured = 0 + attachable = TRUE + secured = FALSE - var/scanning = 0 + var/scanning = FALSE var/health_scan var/alarm_health = 0 @@ -16,31 +16,28 @@ /obj/item/assembly/health/activate() if(!..()) - return 0//Cooldown check + return FALSE//Cooldown check toggle_scan() - return 0 + return TRUE /obj/item/assembly/health/toggle_secure() secured = !secured if(secured && scanning) START_PROCESSING(SSobj, src) else - scanning = 0 + scanning = FALSE STOP_PROCESSING(SSobj, src) update_icon() return secured -/obj/item/assembly/health/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/multitool)) - if(alarm_health == 0) - alarm_health = -90 - user.show_message("You toggle [src] to \"detect death\" mode.") - else - alarm_health = 0 - user.show_message("You toggle [src] to \"detect critical state\" mode.") - return +/obj/item/assembly/health/multitool_act(mob/living/user, obj/item/I) + if(alarm_health == 0) + alarm_health = -90 + to_chat(user, "You toggle [src] to \"detect death\" mode.") else - return ..() + alarm_health = 0 + to_chat(user, "You toggle [src] to \"detect critical state\" mode.") + return TRUE /obj/item/assembly/health/process() if(!scanning || !secured) @@ -58,7 +55,8 @@ health_scan = M.health if(health_scan <= alarm_health) pulse() - audible_message("[icon2html(src, hearers(src))] *beep* *beep*", "*beep* *beep*") + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") + playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) toggle_scan() return return @@ -77,8 +75,9 @@ . = ..() if(!secured) user.show_message("The [name] is unsecured!") - return 0 - var/dat = "Health Sensor [scanning?"On":"Off"]" + return FALSE + var/dat = "Health Sensor" + dat += "
[scanning?"On":"Off"]" if(scanning && health_scan) dat += "
Health: [health_scan]" user << browse(dat, "window=hscan") diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index cb7bd59bb5..f1dc93b446 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -1,16 +1,16 @@ -// See _DEFINES/is_helpers.dm for type helpers - -/* -Name: IsSpecialAssembly -Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door -*/ - -/obj/proc/IsSpecialAssembly() - return 0 - -/* -Name: IsAssemblyHolder -Desc: If true is an object that can hold an assemblyholder object -*/ -/obj/proc/IsAssemblyHolder() - return 0 \ No newline at end of file +// See _DEFINES/is_helpers.dm for type helpers + +/* +Name: IsSpecialAssembly +Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door +*/ + +/obj/proc/IsSpecialAssembly() + return FALSE + +/* +Name: IsAssemblyHolder +Desc: If true is an object that can hold an assemblyholder object +*/ +/obj/proc/IsAssemblyHolder() + return FALSE diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index c830935132..031ce866ba 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -15,7 +15,7 @@ var/obj/item/assembly/a_right = null /obj/item/assembly_holder/IsAssemblyHolder() - return 1 + return TRUE /obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user) @@ -37,6 +37,7 @@ a_left = A else a_right = A + A.holder_movement() /obj/item/assembly_holder/update_icon() cut_overlays() @@ -46,11 +47,16 @@ add_overlay("[O]_l") if(a_right) - var/mutable_appearance/right = mutable_appearance(icon, "[a_right.icon_state]_left") - right.transform = matrix(-1, 0, 0, 0, 1, 0) - for(var/O in a_right.attached_overlays) - right.add_overlay("[O]_l") - add_overlay(right) + if(a_right.is_position_sensitive) + add_overlay("[a_right.icon_state]_right") + for(var/O in a_right.attached_overlays) + add_overlay("[O]_r") + else + var/mutable_appearance/right = mutable_appearance(icon, "[a_right.icon_state]_left") + right.transform = matrix(-1, 0, 0, 0, 1, 0) + for(var/O in a_right.attached_overlays) + right.add_overlay("[O]_l") + add_overlay(right) if(master) master.update_icon() @@ -69,32 +75,37 @@ /obj/item/assembly_holder/Move() . = ..() - if(a_left && a_right) + if(a_left) a_left.holder_movement() + if(a_right) a_right.holder_movement() +/obj/item/assembly_holder/dropped(mob/user) + . = ..() + if(a_left) + a_left.dropped() + if(a_right) + a_right.dropped() + /obj/item/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess . = ..() if(.) return - if(a_left && a_right) - a_left.holder_movement() - a_right.holder_movement() + if(a_left) + a_left.attack_hand() + if(a_right) + a_right.attack_hand() -/obj/item/assembly_holder/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/screwdriver)) - var/turf/T = get_turf(src) - if(!T) - return 0 - if(a_left) - a_left.holder = null - a_left.forceMove(T) - if(a_right) - a_right.holder = null - a_right.forceMove(T) - qdel(src) - else - ..() +/obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/tool) + to_chat(user, "You disassemble [src]!") + if(a_left) + a_left.on_detach() + a_left = null + if(a_right) + a_right.on_detach() + a_right = null + qdel(src) + return TRUE /obj/item/assembly_holder/attack_self(mob/user) src.add_fingerprint(user) @@ -115,12 +126,12 @@ /obj/item/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1) if(!D) - return 0 + return FALSE if((normal) && (a_right) && (a_left)) if(a_right != D) - a_right.pulsed(0) + a_right.pulsed(FALSE) if(a_left != D) - a_left.pulsed(0) + a_left.pulsed(FALSE) if(master) master.receive_signal() - return 1 + return TRUE diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index ef0949481a..2aae7db5e2 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -23,12 +23,12 @@ /obj/item/assembly/igniter/activate() if(!..()) - return 0//Cooldown check + return FALSE//Cooldown check var/turf/location = get_turf(loc) if(location) location.hotspot_expose(1000,1000) sparks.start() - return 1 + return TRUE /obj/item/assembly/igniter/attack_self(mob/user) activate() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 35a2074f94..4a6c9d2db3 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -3,6 +3,7 @@ desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" materials = list(MAT_METAL=1000, MAT_GLASS=500) + is_position_sensitive = TRUE var/on = FALSE var/visible = FALSE @@ -10,6 +11,7 @@ var/list/obj/effect/beam/i_beam/beams var/olddir = 0 var/datum/component/redirect/listener + var/hearing_range = 3 /obj/item/assembly/infra/Initialize() . = ..() @@ -30,23 +32,27 @@ refreshBeam() /obj/item/assembly/infra/Destroy() + STOP_PROCESSING(SSobj, src) QDEL_LIST(beams) - return ..() + . = ..() -/obj/item/assembly/infra/describe() - return "The infrared trigger is [on?"on":"off"]." +/obj/item/assembly/infra/examine(mob/user) + ..() + to_chat(user, "The infrared trigger is [on?"on":"off"].") /obj/item/assembly/infra/activate() if(!..()) - return 0//Cooldown check + return FALSE//Cooldown check on = !on + refreshBeam() update_icon() - return 1 + return TRUE /obj/item/assembly/infra/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSobj, src) + refreshBeam() else QDEL_LIST(beams) STOP_PROCESSING(SSobj, src) @@ -59,13 +65,20 @@ if(on) add_overlay("infrared_on") attached_overlays += "infrared_on" + if(visible && secured) + add_overlay("infrared_visible") + attached_overlays += "infrared_visible" if(holder) holder.update_icon() return /obj/item/assembly/infra/dropped() - refreshBeam() + . = ..() + if(holder) + holder_movement() //sync the dir of the device as well if it's contained in a TTV or an assembly holder + else + refreshBeam() /obj/item/assembly/infra/process() if(!on || !secured) @@ -74,7 +87,15 @@ /obj/item/assembly/infra/proc/refreshBeam() QDEL_LIST(beams) - if(throwing || !on || !secured || !(isturf(loc) || holder && isturf(holder.loc))) + if(throwing || !on || !secured) + return + if(holder) + if(holder.master) //incase the sensor is part of an assembly that's contained in another item, such as a single tank bomb + if(!holder.master.IsSpecialAssembly() || !isturf(holder.master.loc)) + return + else if(!isturf(holder.loc)) //else just check where the holder is + return + else if(!isturf(loc)) //or just where the fuck we are in general return var/turf/T = get_turf(src) var/_dir = dir @@ -82,6 +103,11 @@ if(_T) for(var/i in 1 to maxlength) var/obj/effect/beam/i_beam/I = new(T) + if(istype(holder, /obj/item/assembly_holder)) + var/obj/item/assembly_holder/assembly_holder = holder + I.icon_state = "[initial(I.icon_state)]_[(assembly_holder.a_left == src) ? "l":"r"]" //Sync the offset of the beam with the position of the sensor. + else if(istype(holder, /obj/item/transfer_valve)) + I.icon_state = "[initial(I.icon_state)]_ttv" I.density = TRUE if(!I.Move(_T)) qdel(I) @@ -96,6 +122,12 @@ _T = get_step(_T, _dir) CHECK_TICK +/obj/item/assembly/infra/on_detach() + . = ..() + if(!.) + return + refreshBeam() + /obj/item/assembly/infra/attack_hand() . = ..() refreshBeam() @@ -116,19 +148,17 @@ setDir(olddir) olddir = null -/obj/item/assembly/infra/holder_movement() - if(!holder) - return 0 - refreshBeam() - return 1 - /obj/item/assembly/infra/proc/trigger_beam(atom/movable/AM, turf/location) refreshBeam() switchListener(location) if(!secured || !on || next_activate > world.time) return FALSE - pulse(0) - audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 3) + pulse(FALSE) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + for(var/CHM in get_hearers_in_view(hearing_range, src)) + if(ismob(CHM)) + var/mob/LM = CHM + LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 /obj/item/assembly/infra/proc/switchListener(turf/newloc) @@ -144,7 +174,9 @@ . = ..() if(is_secured(user)) user.set_machine(src) - var/dat = "Infrared Laser\nStatus: [on ? "On" : "Off"]
\nVisibility: [visible ? "Visible" : "Invisible"]
\n" + var/dat = "Infrared Laser" + dat += "
Status: [on ? "On" : "Off"]" + dat += "
Visibility: [visible ? "Visible" : "Invisible"]" dat += "
Refresh" dat += "
Close" user << browse(dat, "window=infra") @@ -163,6 +195,7 @@ refreshBeam() if(href_list["visible"]) visible = !(visible) + update_icon() refreshBeam() if(href_list["close"]) usr << browse(null, "window=infra") diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index a4d7312887..58a3a5349a 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -2,17 +2,15 @@ name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" + item_state = "mousetrap" materials = list(MAT_METAL=100) - attachable = 1 - var/armed = 0 + attachable = TRUE + var/armed = FALSE /obj/item/assembly/mousetrap/examine(mob/user) ..() - if(armed) - to_chat(user, "The mousetrap is armed!") - else - to_chat(user, "The mousetrap is not armed.") + to_chat(user, "The pressure plate is [armed?"primed":"safe"].") /obj/item/assembly/mousetrap/activate() if(..()) @@ -22,13 +20,9 @@ var/mob/living/carbon/human/user = usr if((user.has_trait(TRAIT_DUMB) || user.has_trait(TRAIT_CLUMSY)) && prob(50)) to_chat(user, "Your hand slips, setting off the trigger!") - pulse(0) + pulse(FALSE) update_icon() - if(usr) - playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - -/obj/item/assembly/mousetrap/describe() - return "The pressure switch is [armed?"primed":"safe"]." + playsound(src, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) /obj/item/assembly/mousetrap/update_icon() if(armed) @@ -45,10 +39,10 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.has_trait(TRAIT_PIERCEIMMUNE)) - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, TRUE) armed = FALSE update_icon() - pulse(0) + pulse(FALSE) return FALSE switch(type) if("feet") @@ -66,10 +60,10 @@ var/mob/living/simple_animal/mouse/M = target visible_message("SPLAT!") M.splat() - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, TRUE) armed = FALSE update_icon() - pulse(0) + pulse(FALSE) /obj/item/assembly/mousetrap/attack_self(mob/living/carbon/human/user) @@ -87,7 +81,7 @@ to_chat(user, "You disarm [src].") armed = !armed update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(src, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -145,4 +139,4 @@ /obj/item/assembly/mousetrap/armed icon_state = "mousetraparmed" - armed = 1 + armed = TRUE diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index d79b4786c6..7f6a1fab12 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -3,34 +3,36 @@ desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" materials = list(MAT_METAL=800, MAT_GLASS=200) - attachable = 1 + attachable = TRUE - var/scanning = 0 - var/timing = 0 + var/scanning = FALSE + var/timing = FALSE var/time = 10 var/sensitivity = 1 - -/obj/item/assembly/prox_sensor/proc/toggle_scan() - - -/obj/item/assembly/prox_sensor/proc/sense() - + var/hearing_range = 3 /obj/item/assembly/prox_sensor/Initialize() . = ..() proximity_monitor = new(src, 0) + START_PROCESSING(SSobj, src) -/obj/item/assembly/prox_sensor/describe() - if(timing) - return "The proximity sensor is arming." - return "The proximity sensor is [scanning?"armed":"disarmed"]." +/obj/item/assembly/prox_sensor/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() + +/obj/item/assembly/prox_sensor/examine(mob/user) + ..() + to_chat(user, "The proximity sensor is [timing ? "arming" : (scanning ? "armed" : "disarmed")].") /obj/item/assembly/prox_sensor/activate() if(!..()) - return 0//Cooldown check - timing = !timing + return FALSE//Cooldown check + if(!scanning) + timing = !timing + else + scanning = FALSE update_icon() - return 1 + return TRUE /obj/item/assembly/prox_sensor/toggle_secure() secured = !secured @@ -38,8 +40,10 @@ if(scanning) toggle_scan() proximity_monitor.host = src - timing = 0 + timing = FALSE + STOP_PROCESSING(SSobj, src) else + START_PROCESSING(SSobj, src) proximity_monitor.host = loc update_icon() return secured @@ -51,25 +55,31 @@ sense() -/obj/item/assembly/prox_sensor/sense() +/obj/item/assembly/prox_sensor/proc/sense() if(!scanning || !secured || next_activate > world.time) - return 0 - pulse(0) - audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 3) + return FALSE + pulse(FALSE) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + for(var/CHM in get_hearers_in_view(hearing_range, src)) + if(ismob(CHM)) + var/mob/LM = CHM + LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 + return TRUE /obj/item/assembly/prox_sensor/process() - if(timing) - time-- - if(time <= 0) - timing = 0 - toggle_scan(1) - time = initial(time) + if(!timing) + return + time-- + if(time <= 0) + timing = FALSE + toggle_scan(TRUE) + time = initial(time) -/obj/item/assembly/prox_sensor/toggle_scan(scan) +/obj/item/assembly/prox_sensor/proc/toggle_scan(scan) if(!secured) - return 0 + return FALSE scanning = scan proximity_monitor.SetRange(scanning ? sensitivity : 0) update_icon() @@ -98,8 +108,11 @@ if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 - var/dat = "Proximity Sensor\n[(timing ? "Arming" : "Not Arming")] [minute]:[second]\n- - + +\n" - dat += "
Armed":"1'>Unarmed"] (Movement sensor active when armed!)" + var/dat = "Proximity Sensor" + if(!scanning) + dat += "
[(timing ? "Arming" : "Not Arming")] [minute]:[second]" + dat += "
- - + +" + dat += "
Armed":"1'>Unarmed (Movement sensor active when armed!)"]" dat += "
Detection range: - [sensitivity] +" dat += "
Refresh" dat += "
Close" diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 38f2acb45f..8d9ba9880c 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -13,18 +13,18 @@ qdel(part2) return ..() -/obj/item/assembly/shock_kit/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/wrench)) +/obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) + to_chat(user, "You disassemble [src].") + if(part1) part1.forceMove(drop_location()) - part2.forceMove(drop_location()) part1.master = null - part2.master = null part1 = null + if(part2) + part2.forceMove(drop_location()) + part2.master = null part2 = null - qdel(src) - return - add_fingerprint(user) - return + qdel(src) + return TRUE /obj/item/assembly/shock_kit/attack_self(mob/user) part1.attack_self(user) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 4b44397713..c293439431 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -7,17 +7,18 @@ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' materials = list(MAT_METAL=400, MAT_GLASS=120) wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE - attachable = 1 + attachable = TRUE var/code = DEFAULT_SIGNALER_CODE var/frequency = FREQ_SIGNALER var/delay = 0 var/datum/radio_frequency/radio_connection var/suicider = null + var/hearing_range = 1 /obj/item/assembly/signaler/suicide_act(mob/living/carbon/user) user.visible_message("[user] eats \the [src]! If it is signaled, [user.p_they()] will die!") - playsound(src, 'sound/items/eatfood.ogg', 50, 1) + playsound(src, 'sound/items/eatfood.ogg', 50, TRUE) user.transferItemToLoc(src, user, TRUE) suicider = user return MANUAL_SUICIDE @@ -27,15 +28,14 @@ user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something. user.death(0) -/obj/item/assembly/signaler/New() - ..() - spawn(40) - set_frequency(frequency) +/obj/item/assembly/signaler/Initialize() + . = ..() + set_frequency(frequency) /obj/item/assembly/signaler/Destroy() SSradio.remove_object(src,frequency) - return ..() + . = ..() /obj/item/assembly/signaler/activate() if(!..())//cooldown processing @@ -80,7 +80,7 @@ Code: /obj/item/assembly/signaler/Topic(href, href_list) ..() - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + if(!usr.canUseTopic(src, BE_CLOSE)) usr << browse(null, "window=radio") onclose(usr, "radio") return @@ -111,7 +111,7 @@ Code: var/obj/item/assembly/signaler/signaler2 = W if(secured && signaler2.secured) code = signaler2.code - frequency = signaler2.frequency + set_frequency(signaler2.frequency) to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]") ..() @@ -131,17 +131,22 @@ Code: return /obj/item/assembly/signaler/receive_signal(datum/signal/signal) + . = FALSE if(!signal) - return 0 + return if(signal.data["code"] != code) - return 0 + return if(!(src.wires & WIRE_RADIO_RECEIVE)) - return 0 + return if(suicider) manual_suicide(suicider) - pulse(1) - audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 1) - return + pulse(TRUE) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + for(var/CHM in get_hearers_in_view(hearing_range, src)) + if(ismob(CHM)) + var/mob/LM = CHM + LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + return TRUE /obj/item/assembly/signaler/proc/set_frequency(new_frequency) @@ -161,10 +166,11 @@ Code: /obj/item/assembly/signaler/reciever/activate() toggle_safety() - return 1 + return TRUE -/obj/item/assembly/signaler/reciever/describe() - return "The radio receiver is [on?"on":"off"]." +/obj/item/assembly/signaler/reciever/examine(mob/user) + ..() + to_chat(user, "The radio receiver is [on?"on":"off"].") /obj/item/assembly/signaler/reciever/receive_signal(datum/signal/signal) if(!on) @@ -180,14 +186,16 @@ Code: item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + var/anomaly_type = /obj/effect/anomaly /obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal) if(!signal) - return 0 + return FALSE if(signal.data["code"] != code) - return 0 + return FALSE for(var/obj/effect/anomaly/A in get_turf(src)) A.anomalyNeutralize() + return TRUE /obj/item/assembly/signaler/anomaly/attack_self() return @@ -196,3 +204,5 @@ Code: /obj/item/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params) return +/obj/item/assembly/signaler/cyborg/screwdriver_act(mob/living/user, obj/item/I) + return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 7c74c1ca77..993bf134e6 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -3,12 +3,13 @@ desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" materials = list(MAT_METAL=500, MAT_GLASS=50) - attachable = 1 + attachable = TRUE - var/timing = 0 + var/timing = FALSE var/time = 5 var/saved_time = 5 - var/loop = 0 + var/loop = FALSE + var/hearing_range = 3 /obj/item/assembly/timer/suicide_act(mob/living/user) user.visible_message("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!") @@ -21,22 +22,24 @@ user.adjustOxyLoss(200) user.death(0) -/obj/item/assembly/timer/New() - ..() +/obj/item/assembly/timer/Initialize() + . = ..() START_PROCESSING(SSobj, src) -/obj/item/assembly/timer/describe() - if(timing) - return "The timer is counting down from [time]!" - return "The timer is set for [time] seconds." +/obj/item/assembly/timer/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() +/obj/item/assembly/timer/examine(mob/user) + ..() + to_chat(user, "The timer is [timing ? "counting down from [time]":"set for [time] seconds"].") /obj/item/assembly/timer/activate() if(!..()) - return 0//Cooldown check + return FALSE//Cooldown check timing = !timing update_icon() - return 1 + return TRUE /obj/item/assembly/timer/toggle_secure() @@ -44,7 +47,7 @@ if(secured) START_PROCESSING(SSobj, src) else - timing = 0 + timing = FALSE STOP_PROCESSING(SSobj, src) update_icon() return secured @@ -53,20 +56,25 @@ /obj/item/assembly/timer/proc/timer_end() if(!secured || next_activate > world.time) return FALSE - pulse(0) - audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 3) + pulse(FALSE) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + for(var/CHM in get_hearers_in_view(hearing_range, src)) + if(ismob(CHM)) + var/mob/LM = CHM + LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) if(loop) - timing = 1 + timing = TRUE update_icon() /obj/item/assembly/timer/process() - if(timing) - time-- - if(time <= 0) - timing = 0 - timer_end() - time = saved_time + if(!timing) + return + time-- + if(time <= 0) + timing = FALSE + timer_end() + time = saved_time /obj/item/assembly/timer/update_icon() @@ -84,7 +92,9 @@ if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 - var/dat = "Timing Unit\n[(timing ? "Timing" : "Not Timing")] [minute]:[second]\n- - + +\n" + var/dat = "Timing Unit" + dat += "
[(timing ? "Timing" : "Not Timing")] [minute]:[second]" + dat += "
- - + +" dat += "
Stop repeating" : "1'>Set to repeat")]" dat += "
Refresh" dat += "
Close" @@ -95,7 +105,7 @@ /obj/item/assembly/timer/Topic(href, href_list) ..() - if(usr.incapacitated() || !in_range(loc, usr)) + if(!usr.canUseTopic(src, BE_CLOSE)) usr << browse(null, "window=timer") onclose(usr, "timer") return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 71f51aaaf9..ca97752d90 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -1,14 +1,19 @@ +#define INCLUSIVE_MODE 1 +#define EXCLUSIVE_MODE 2 +#define RECOGNIZER_MODE 3 +#define VOICE_SENSOR_MODE 4 + /obj/item/assembly/voice name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" materials = list(MAT_METAL=500, MAT_GLASS=50) flags_1 = HEAR_1 - attachable = 1 + attachable = TRUE verb_say = "beeps" verb_ask = "beeps" verb_exclaim = "beeps" - var/listening = 0 + var/listening = FALSE var/recorded = "" //the activation message var/mode = 1 var/static/list/modes = list("inclusive", @@ -32,60 +37,64 @@ /obj/item/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language) switch(mode) - if(1) + if(INCLUSIVE_MODE) recorded = raw_message - listening = 0 + listening = FALSE say("Activation message is '[recorded]'.", message_language) - if(2) + if(EXCLUSIVE_MODE) recorded = raw_message - listening = 0 + listening = FALSE say("Activation message is '[recorded]'.", message_language) - if(3) + if(RECOGNIZER_MODE) recorded = speaker.GetVoice() - listening = 0 + listening = FALSE say("Your voice pattern is saved.", message_language) - if(4) + if(VOICE_SENSOR_MODE) if(length(raw_message)) addtimer(CALLBACK(src, .proc/pulse, 0), 10) /obj/item/assembly/voice/proc/check_activation(atom/movable/speaker, raw_message) - . = 0 + . = FALSE switch(mode) - if(1) + if(INCLUSIVE_MODE) if(findtext(raw_message, recorded)) - . = 1 - if(2) + . = TRUE + if(EXCLUSIVE_MODE) if(raw_message == recorded) - . = 1 - if(3) + . = TRUE + if(RECOGNIZER_MODE) if(speaker.GetVoice() == recorded) - . = 1 - if(4) + . = TRUE + if(VOICE_SENSOR_MODE) if(length(raw_message)) - . = 1 + . = TRUE -/obj/item/assembly/voice/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/multitool)) - mode %= modes.len - mode++ - to_chat(user, "You set [src] into a [modes[mode]] mode.") - listening = 0 - recorded = "" - else - return ..() +/obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) + mode %= modes.len + mode++ + to_chat(user, "You set [src] into [modes[mode]] mode.") + listening = FALSE + recorded = "" + return TRUE /obj/item/assembly/voice/activate() - if(secured) - if(!holder) - listening = !listening - say("[listening ? "Now" : "No longer"] recording input.") + if(!secured || holder) + return FALSE + listening = !listening + say("[listening ? "Now" : "No longer"] recording input.") + return TRUE /obj/item/assembly/voice/attack_self(mob/user) if(!user) - return 0 + return FALSE activate() - return 1 + return TRUE /obj/item/assembly/voice/toggle_secure() . = ..() - listening = 0 + listening = FALSE + +#undef INCLUSIVE_MODE +#undef EXCLUSIVE_MODE +#undef RECOGNIZER_MODE +#undef VOICE_SENSOR_MODE diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 689abbc388..15c2f1e4a6 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -191,7 +191,7 @@ //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again. /datum/gas_reaction/fusion - exclude = FALSE + exclude = TRUE priority = 2 name = "Plasmic Fusion" id = "fusion" diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 28148c0364..5dcf95f3cf 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -34,8 +34,10 @@ Iconnery var/turf/T = loc if(level == 2 || !T.intact) showpipe = TRUE + plane = GAME_PLANE else showpipe = FALSE + plane = FLOOR_PLANE if(!showpipe) return //no need to update the pipes if they aren't showing diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index 37afb31a6b..9eec36f53a 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -101,7 +101,7 @@ export_types = list(/obj/machinery/iv_drip) /datum/export/large/barrier - cost = 325 + cost = 100 unit_name = "security barrier" export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a961e87c48..2d3ed07505 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1649,8 +1649,9 @@ . = ..() if(prob(50)) var/mob/living/simple_animal/pet/dog/corgi/D = locate() in . - qdel(D) - new /mob/living/simple_animal/pet/dog/corgi/Lisa(.) + if(D.gender == FEMALE) + qdel(D) + new /mob/living/simple_animal/pet/dog/corgi/Lisa(.) /datum/supply_pack/critter/cow name = "Cow Crate" diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index c821204993..d3c09b2348 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -157,12 +157,14 @@ GLOBAL_LIST_EMPTY(asset_datums) //get an assetdatum or make a new one /proc/get_asset_datum(var/type) - if (!(type in GLOB.asset_datums)) - return new type() - return GLOB.asset_datums[type] + return GLOB.asset_datums[type] || new type() + +/datum/asset + var/_abstract = /datum/asset /datum/asset/New() GLOB.asset_datums[type] = src + register() /datum/asset/proc/register() return @@ -170,20 +172,173 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset/proc/send(client) return + //If you don't need anything complicated. /datum/asset/simple + _abstract = /datum/asset/simple var/assets = list() var/verify = FALSE /datum/asset/simple/register() for(var/asset_name in assets) register_asset(asset_name, assets[asset_name]) + /datum/asset/simple/send(client) send_asset_list(client,assets,verify) +// For registering or sending multiple others at once +/datum/asset/group + _abstract = /datum/asset/group + var/list/children + +/datum/asset/group/register() + for(var/type in children) + get_asset_datum(type) + +/datum/asset/group/send(client/C) + for(var/type in children) + var/datum/asset/A = get_asset_datum(type) + A.send(C) + + +// spritesheet implementation - coalesces various icons into a single .png file +// and uses CSS to select icons out of that file - saves on transferring some +// 1400-odd individual PNG files +#define SPR_SIZE 1 +#define SPR_IDX 2 +#define SPRSZ_COUNT 1 +#define SPRSZ_ICON 2 +#define SPRSZ_STRIPPED 3 + +/datum/asset/spritesheet + _abstract = /datum/asset/spritesheet + var/name + var/list/sizes = list() // "32x32" -> list(10, icon/normal, icon/stripped) + var/list/sprites = list() // "foo_bar" -> list("32x32", 5) + var/verify = FALSE + +/datum/asset/spritesheet/register() + if (!name) + CRASH("spritesheet [type] cannot register without a name") + ensure_stripped() + + var/res_name = "spritesheet_[name].css" + var/fname = "data/spritesheets/[res_name]" + call("rust_g", "file_write")(generate_css(), fname) + register_asset(res_name, file(fname)) + + for(var/size_id in sizes) + var/size = sizes[size_id] + register_asset("[name]_[size_id].png", size[SPRSZ_STRIPPED]) + +/datum/asset/spritesheet/send(client/C) + if (!name) + return + var/all = list("spritesheet_[name].css") + for(var/size_id in sizes) + all += "[name]_[size_id].png" + send_asset_list(C, all, verify) + +/datum/asset/spritesheet/proc/ensure_stripped(sizes_to_strip = sizes) + for(var/size_id in sizes_to_strip) + var/size = sizes[size_id] + if (size[SPRSZ_STRIPPED]) + continue + + // save flattened version + var/fname = "data/spritesheets/[name]_[size_id].png" + fcopy(size[SPRSZ_ICON], fname) + var/error = call("rust_g", "dmi_strip_metadata")(fname) + if(length(error)) + stack_trace("Failed to strip [name]_[size_id].png: [error]") + size[SPRSZ_STRIPPED] = icon(fname) + +/datum/asset/spritesheet/proc/generate_css() + var/list/out = list() + + for (var/size_id in sizes) + var/size = sizes[size_id] + var/icon/tiny = size[SPRSZ_ICON] + out += ".[name][size_id]{display:inline-block;width:[tiny.Width()]px;height:[tiny.Height()]px;background:url('[name]_[size_id].png') no-repeat;}" + + for (var/sprite_id in sprites) + var/sprite = sprites[sprite_id] + var/size_id = sprite[SPR_SIZE] + var/idx = sprite[SPR_IDX] + var/size = sizes[size_id] + + var/icon/tiny = size[SPRSZ_ICON] + var/icon/big = size[SPRSZ_STRIPPED] + var/per_line = big.Width() / tiny.Width() + var/x = (idx % per_line) * tiny.Width() + var/y = round(idx / per_line) * tiny.Height() + + out += ".[name][size_id].[sprite_id]{background-position:-[x]px -[y]px;}" + + return out.Join("\n") + +/datum/asset/spritesheet/proc/Insert(sprite_name, icon/I, icon_state="", dir=SOUTH, frame=1, moving=FALSE) + I = icon(I, icon_state=icon_state, dir=dir, frame=frame, moving=moving) + if (!I || !length(icon_states(I))) // that direction or state doesn't exist + return + var/size_id = "[I.Width()]x[I.Height()]" + var/size = sizes[size_id] + + if (sprites[sprite_name]) + CRASH("duplicate sprite \"[sprite_name]\" in sheet [name] ([type])") + + if (size) + var/position = size[SPRSZ_COUNT]++ + var/icon/sheet = size[SPRSZ_ICON] + size[SPRSZ_STRIPPED] = null + sheet.Insert(I, icon_state=sprite_name) + sprites[sprite_name] = list(size_id, position) + else + sizes[size_id] = size = list(1, I, null) + sprites[sprite_name] = list(size_id, 0) + +/datum/asset/spritesheet/proc/InsertAll(prefix, icon/I, list/directions) + if (length(prefix)) + prefix = "[prefix]-" + + if (!directions) + directions = list(SOUTH) + + for (var/icon_state_name in icon_states(I)) + for (var/direction in directions) + var/prefix2 = (directions.len > 1) ? "[dir2text(direction)]-" : "" + Insert("[prefix][prefix2][icon_state_name]", I, icon_state=icon_state_name, dir=direction) + +/datum/asset/spritesheet/proc/css_tag() + return {""} + +/datum/asset/spritesheet/proc/icon_tag(sprite_name) + var/sprite = sprites[sprite_name] + if (!sprite) + return null + var/size_id = sprite[SPR_SIZE] + return {""} + +#undef SPR_SIZE +#undef SPR_IDX +#undef SPRSZ_COUNT +#undef SPRSZ_ICON +#undef SPRSZ_STRIPPED + + +/datum/asset/spritesheet/simple + _abstract = /datum/asset/spritesheet/simple + var/list/assets + +/datum/asset/spritesheet/simple/register() + for (var/key in assets) + Insert(key, assets[key]) + ..() + //Generates assets based on iconstates of a single icon /datum/asset/simple/icon_states + _abstract = /datum/asset/simple/icon_states var/icon var/list/directions = list(SOUTH) var/frame = 1 @@ -209,6 +364,7 @@ GLOBAL_LIST_EMPTY(asset_datums) register_asset(asset_name, asset) /datum/asset/simple/icon_states/multiple_icons + _abstract = /datum/asset/simple/icon_states/multiple_icons var/list/icons /datum/asset/simple/icon_states/multiple_icons/register() @@ -260,50 +416,52 @@ GLOBAL_LIST_EMPTY(asset_datums) "smmon_6.gif" = 'icons/program_icons/smmon_6.gif' ) -/datum/asset/simple/pda +/datum/asset/spritesheet/simple/pda + name = "pda" assets = list( - "pda_atmos.png" = 'icons/pda_icons/pda_atmos.png', - "pda_back.png" = 'icons/pda_icons/pda_back.png', - "pda_bell.png" = 'icons/pda_icons/pda_bell.png', - "pda_blank.png" = 'icons/pda_icons/pda_blank.png', - "pda_boom.png" = 'icons/pda_icons/pda_boom.png', - "pda_bucket.png" = 'icons/pda_icons/pda_bucket.png', - "pda_medbot.png" = 'icons/pda_icons/pda_medbot.png', - "pda_floorbot.png" = 'icons/pda_icons/pda_floorbot.png', - "pda_cleanbot.png" = 'icons/pda_icons/pda_cleanbot.png', - "pda_crate.png" = 'icons/pda_icons/pda_crate.png', - "pda_cuffs.png" = 'icons/pda_icons/pda_cuffs.png', - "pda_eject.png" = 'icons/pda_icons/pda_eject.png', - "pda_flashlight.png" = 'icons/pda_icons/pda_flashlight.png', - "pda_honk.png" = 'icons/pda_icons/pda_honk.png', - "pda_mail.png" = 'icons/pda_icons/pda_mail.png', - "pda_medical.png" = 'icons/pda_icons/pda_medical.png', - "pda_menu.png" = 'icons/pda_icons/pda_menu.png', - "pda_mule.png" = 'icons/pda_icons/pda_mule.png', - "pda_notes.png" = 'icons/pda_icons/pda_notes.png', - "pda_power.png" = 'icons/pda_icons/pda_power.png', - "pda_rdoor.png" = 'icons/pda_icons/pda_rdoor.png', - "pda_reagent.png" = 'icons/pda_icons/pda_reagent.png', - "pda_refresh.png" = 'icons/pda_icons/pda_refresh.png', - "pda_scanner.png" = 'icons/pda_icons/pda_scanner.png', - "pda_signaler.png" = 'icons/pda_icons/pda_signaler.png', - "pda_status.png" = 'icons/pda_icons/pda_status.png', - "pda_dronephone.png" = 'icons/pda_icons/pda_dronephone.png' + "atmos" = 'icons/pda_icons/pda_atmos.png', + "back" = 'icons/pda_icons/pda_back.png', + "bell" = 'icons/pda_icons/pda_bell.png', + "blank" = 'icons/pda_icons/pda_blank.png', + "boom" = 'icons/pda_icons/pda_boom.png', + "bucket" = 'icons/pda_icons/pda_bucket.png', + "medbot" = 'icons/pda_icons/pda_medbot.png', + "floorbot" = 'icons/pda_icons/pda_floorbot.png', + "cleanbot" = 'icons/pda_icons/pda_cleanbot.png', + "crate" = 'icons/pda_icons/pda_crate.png', + "cuffs" = 'icons/pda_icons/pda_cuffs.png', + "eject" = 'icons/pda_icons/pda_eject.png', + "flashlight" = 'icons/pda_icons/pda_flashlight.png', + "honk" = 'icons/pda_icons/pda_honk.png', + "mail" = 'icons/pda_icons/pda_mail.png', + "medical" = 'icons/pda_icons/pda_medical.png', + "menu" = 'icons/pda_icons/pda_menu.png', + "mule" = 'icons/pda_icons/pda_mule.png', + "notes" = 'icons/pda_icons/pda_notes.png', + "power" = 'icons/pda_icons/pda_power.png', + "rdoor" = 'icons/pda_icons/pda_rdoor.png', + "reagent" = 'icons/pda_icons/pda_reagent.png', + "refresh" = 'icons/pda_icons/pda_refresh.png', + "scanner" = 'icons/pda_icons/pda_scanner.png', + "signaler" = 'icons/pda_icons/pda_signaler.png', + "status" = 'icons/pda_icons/pda_status.png', + "dronephone" = 'icons/pda_icons/pda_dronephone.png' ) -/datum/asset/simple/paper +/datum/asset/spritesheet/simple/paper + name = "paper" assets = list( - "large_stamp-clown.png" = 'icons/stamp_icons/large_stamp-clown.png', - "large_stamp-deny.png" = 'icons/stamp_icons/large_stamp-deny.png', - "large_stamp-ok.png" = 'icons/stamp_icons/large_stamp-ok.png', - "large_stamp-hop.png" = 'icons/stamp_icons/large_stamp-hop.png', - "large_stamp-cmo.png" = 'icons/stamp_icons/large_stamp-cmo.png', - "large_stamp-ce.png" = 'icons/stamp_icons/large_stamp-ce.png', - "large_stamp-hos.png" = 'icons/stamp_icons/large_stamp-hos.png', - "large_stamp-rd.png" = 'icons/stamp_icons/large_stamp-rd.png', - "large_stamp-cap.png" = 'icons/stamp_icons/large_stamp-cap.png', - "large_stamp-qm.png" = 'icons/stamp_icons/large_stamp-qm.png', - "large_stamp-law.png" = 'icons/stamp_icons/large_stamp-law.png' + "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', + "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', + "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', + "stamp-hop" = 'icons/stamp_icons/large_stamp-hop.png', + "stamp-cmo" = 'icons/stamp_icons/large_stamp-cmo.png', + "stamp-ce" = 'icons/stamp_icons/large_stamp-ce.png', + "stamp-hos" = 'icons/stamp_icons/large_stamp-hos.png', + "stamp-rd" = 'icons/stamp_icons/large_stamp-rd.png', + "stamp-cap" = 'icons/stamp_icons/large_stamp-cap.png', + "stamp-qm" = 'icons/stamp_icons/large_stamp-qm.png', + "stamp-law" = 'icons/stamp_icons/large_stamp-law.png' ) /datum/asset/simple/IRV @@ -335,10 +493,22 @@ GLOBAL_LIST_EMPTY(asset_datums) "changelog.css" = 'html/changelog.css' ) -/datum/asset/simple/goonchat +/datum/asset/group/goonchat + children = list( + /datum/asset/simple/jquery, + /datum/asset/simple/goonchat, + /datum/asset/spritesheet/goonchat + ) + +/datum/asset/simple/jquery verify = FALSE assets = list( "jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js', + ) + +/datum/asset/simple/goonchat + verify = FALSE + assets = list( "json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js', "errorHandler.js" = 'code/modules/goonchat/browserassets/js/errorHandler.js', "browserOutput.js" = 'code/modules/goonchat/browserassets/js/browserOutput.js', @@ -350,6 +520,24 @@ GLOBAL_LIST_EMPTY(asset_datums) "browserOutput.css" = 'code/modules/goonchat/browserassets/css/browserOutput.css', ) +/datum/asset/spritesheet/goonchat + name = "chat" + +/datum/asset/spritesheet/goonchat/register() + InsertAll("emoji", 'icons/emoji.dmi') + + // pre-loading all lanugage icons also helps to avoid meta + InsertAll("language", 'icons/misc/language.dmi') + // catch languages which are pulling icons from another file + for(var/path in typesof(/datum/language)) + var/datum/language/L = path + var/icon = initial(L.icon) + if (icon != 'icons/misc/language.dmi') + var/icon_state = initial(L.icon_state) + Insert("language-[icon_state]", icon, icon_state=icon_state) + + ..() + /datum/asset/simple/permissions assets = list( "padlock.png" = 'html/padlock.png' @@ -362,26 +550,19 @@ GLOBAL_LIST_EMPTY(asset_datums) var/datum/language/L = new path () L.get_icon() -/datum/asset/simple/icon_states/emojis - icon = 'icons/emoji.dmi' - generic_icon_names = TRUE +/datum/asset/spritesheet/pipes + name = "pipes" -/datum/asset/simple/icon_states/multiple_icons/pipes - icons = list('icons/obj/atmospherics/pipes/pipe_item.dmi', 'icons/obj/atmospherics/pipes/disposal.dmi', 'icons/obj/atmospherics/pipes/transit_tube.dmi') - prefix = "pipe" - -/datum/asset/simple/icon_states/multiple_icons/pipes/New() - directions = GLOB.alldirs +/datum/asset/spritesheet/pipes/register() + for (var/each in list('icons/obj/atmospherics/pipes/pipe_item.dmi', 'icons/obj/atmospherics/pipes/disposal.dmi', 'icons/obj/atmospherics/pipes/transit_tube.dmi')) + InsertAll("", each, GLOB.alldirs) ..() -/datum/asset/simple/icon_states/multiple_icons/pipes/register() - ..() - var/meter = icon('icons/obj/atmospherics/pipes/simple.dmi', "meterX", SOUTH, frame, movement_states) - if(meter) - register_asset(sanitize_filename("[prefix].south.meterX.png"), fcopy_rsc(meter)) - // Representative icons for each research design -/datum/asset/simple/research_designs/register() +/datum/asset/spritesheet/research_designs + name = "design" + +/datum/asset/spritesheet/research_designs/register() for (var/path in subtypesof(/datum/design)) var/datum/design/D = path @@ -401,7 +582,6 @@ GLOBAL_LIST_EMPTY(asset_datums) if (machine) item = machine var/icon_file = initial(item.icon) - var/all_states = icon_states(icon_file) var/icon/I = icon(icon_file, initial(item.icon_state), SOUTH) // computers (and snowflakes) get their screen and keyboard sprites @@ -409,10 +589,11 @@ GLOBAL_LIST_EMPTY(asset_datums) var/obj/machinery/computer/C = item var/screen = initial(C.icon_screen) var/keyboard = initial(C.icon_keyboard) + var/all_states = icon_states(icon_file) if (screen && (screen in all_states)) I.Blend(icon(icon_file, screen, SOUTH), ICON_OVERLAY) if (keyboard && (keyboard in all_states)) I.Blend(icon(icon_file, keyboard, SOUTH), ICON_OVERLAY) - assets["design_[initial(D.id)].png"] = I + Insert(initial(D.id), I) return ..() diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 49d6c4b04a..d413353b11 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -165,6 +165,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) return var_name != NAMEOF(src, holder) && ..() /client/New(TopicData) + world.SetConfig("APP/admin", ckey, "role=admin") //CITADEL EDIT - Allows admins to reboot in OOM situations var/tdata = TopicData //save this for later use chatOutput = new /datum/chatOutput(src) TopicData = null //Prevent calls to client.Topic from connect @@ -179,10 +180,15 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins. //Admin Authorisation holder = GLOB.admin_datums[ckey] + var/debug_tools_allowed = FALSE //CITADEL EDIT if(holder) GLOB.admins |= src holder.owner = src connecting_admin = TRUE + //CITADEL EDIT + if(check_rights_for(src, R_DEBUG)) + debug_tools_allowed = TRUE + //END CITADEL EDIT else if(GLOB.deadmins[ckey]) verbs += /client/proc/readmin connecting_admin = TRUE @@ -197,6 +203,12 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) to_chat(world, "Autoadmin rank not found") else new /datum/admins(autorank, ckey) + //CITADEL EDIT + if(check_rights_for(src, R_DEBUG)) //check if autoadmin gave us it + debug_tools_allowed = TRUE + if(!debug_tools_allowed) + world.SetConfig("APP/admin", ckey, null) + //END CITADEL EDIT if(CONFIG_GET(flag/enable_localhost_rank) && !connecting_admin) var/localhost_addresses = list("127.0.0.1", "::1") if(isnull(address) || (address in localhost_addresses)) @@ -381,7 +393,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) winset(src, "[topmenu.type]", "parent=menu;name=[url_encode(topmenuname)]") var/list/entries = topmenu.Generate_list(src) for (var/child in entries) - winset(src, "[url_encode(child)]", "[entries[child]]") + winset(src, "[child]", "[entries[child]]") if (!ispath(child, /datum/verbs/menu)) var/atom/verb/verbpath = child if (copytext(verbpath.name,1,2) != "@") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7558380a36..a95686f581 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -83,12 +83,12 @@ GLOBAL_LIST_EMPTY(preferences_datums) //Mob preview var/icon/preview_icon = null - //Trait list - var/list/positive_traits = list() - var/list/negative_traits = list() - var/list/neutral_traits = list() - var/list/all_traits = list() - var/list/character_traits = list() + //Quirk list + var/list/positive_quirks = list() + var/list/negative_quirks = list() + var/list/neutral_quirks = list() + var/list/all_quirks = list() + var/list/character_quirks = list() //Jobs, uses bitflags var/job_civilian_high = 0 @@ -120,6 +120,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/parallax + var/ambientocclusion = TRUE + var/uplink_spawn_loc = UPLINK_PDA var/list/exp = list() @@ -193,9 +195,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
Occupation Choices
" dat += "Set Occupation PreferencesTrait Setup
" - dat += "Configure TraitsQuirk Setup
" + dat += "Configure QuirksIdentity
" dat += "| "
if(jobban_isbanned(user, "appearance"))
@@ -490,6 +492,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "High"
dat += " " + dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"] " + dat += " | "
dat += "Special Role Settings" @@ -855,72 +859,72 @@ GLOBAL_LIST_EMPTY(preferences_datums) return job_engsec_low return 0 -/datum/preferences/proc/SetTraits(mob/user) - if(!SStraits) - to_chat(user, "The trait subsystem is still initializing! Try again in a minute.") +/datum/preferences/proc/SetQuirks(mob/user) + if(!SSquirks) + to_chat(user, "The quirk subsystem is still initializing! Try again in a minute.") return var/list/dat = list() - if(!SStraits.traits.len) - dat += "The trait subsystem hasn't finished initializing, please hold..." + if(!SSquirks.quirks.len) + dat += "The quirk subsystem hasn't finished initializing, please hold..." dat += "" else - dat += " " - dat += " Left-click to add or remove traits. You need one negative trait for every positive trait. "
+ dat += "\ - Traits are applied at roundstart and cannot normally be removed. " + dat += " Left-click to add or remove quirks. You need negative quirks to have positive ones. "
dat += "\ + Quirks are applied at roundstart and cannot normally be removed. " - dat += " \ - Trait balance remaining: [GetTraitBalance()] " - for(var/V in SStraits.traits) - var/datum/trait/T = SStraits.traits[V] - var/trait_name = initial(T.name) - var/has_trait - var/trait_cost = initial(T.value) * -1 + dat += " \ + Quirk balance remaining: [GetQuirkBalance()] " + for(var/V in SSquirks.quirks) + var/datum/quirk/T = SSquirks.quirks[V] + var/quirk_name = initial(T.name) + var/has_quirk + var/quirk_cost = initial(T.value) * -1 var/lock_reason = "This trait is unavailable." - var/trait_conflict = FALSE - for(var/_V in all_traits) - if(_V == trait_name) - has_trait = TRUE - if(initial(T.mood_trait) && CONFIG_GET(flag/disable_human_mood)) + var/quirk_conflict = FALSE + for(var/_V in all_quirks) + if(_V == quirk_name) + has_quirk = TRUE + if(initial(T.mood_quirk) && CONFIG_GET(flag/disable_human_mood)) lock_reason = "Mood is disabled." - trait_conflict = TRUE - if(has_trait) - if(trait_conflict) - all_traits -= trait_name - has_trait = FALSE + quirk_conflict = TRUE + if(has_quirk) + if(quirk_conflict) + all_quirks -= quirk_name + has_quirk = FALSE else - trait_cost *= -1 //invert it back, since we'd be regaining this amount - if(trait_cost > 0) - trait_cost = "+[trait_cost]" + quirk_cost *= -1 //invert it back, since we'd be regaining this amount + if(quirk_cost > 0) + quirk_cost = "+[quirk_cost]" var/font_color = "#AAAAFF" if(initial(T.value) != 0) font_color = initial(T.value) > 0 ? "#AAFFAA" : "#FFAAAA" - if(trait_conflict) - dat += "[trait_name] - [initial(T.desc)] \ + if(quirk_conflict) + dat += "[quirk_name] - [initial(T.desc)] \ LOCKED: [lock_reason] " else - if(has_trait) - dat += "[trait_name] - [initial(T.desc)] \ - [has_trait ? "Lose" : "Take"] ([trait_cost] pts.) " + if(has_quirk) + dat += "[quirk_name] - [initial(T.desc)] \ + [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.) " else - dat += "[trait_name] - [initial(T.desc)] \ - [has_trait ? "Lose" : "Take"] ([trait_cost] pts.) " + dat += "[quirk_name] - [initial(T.desc)] \ + [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.) " dat += " Trait Preferences ", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
+ var/datum/browser/popup = new(user, "mob_occupation", "Quirk Preferences ", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
popup.set_window_options("can_close=0")
popup.set_content(dat.Join())
popup.open(0)
return
-/datum/preferences/proc/GetTraitBalance()
+/datum/preferences/proc/GetQuirkBalance()
var/bal = 0
- for(var/V in all_traits)
- var/datum/trait/T = SStraits.traits[V]
+ for(var/V in all_quirks)
+ var/datum/quirk/T = SSquirks.quirks[V]
bal -= initial(T.value)
return bal
@@ -977,55 +981,49 @@ GLOBAL_LIST_EMPTY(preferences_datums)
user << browse(null, "window=mob_occupation")
ShowChoices(user)
if("update")
- var/trait = href_list["trait"]
- if(!SStraits.traits[trait])
+ var/quirk = href_list["trait"]
+ if(!SSquirks.quirks[quirk])
return
- var/value = SStraits.trait_points[trait]
+ var/value = SSquirks.quirk_points[quirk]
if(value == 0)
- if(trait in neutral_traits)
- neutral_traits -= trait
- all_traits -= trait
+ if(quirk in neutral_quirks)
+ neutral_quirks -= quirk
+ all_quirks -= quirk
else
- if(all_traits.len >= MAX_TRAITS)
- to_chat(user, "You can't have more than [MAX_TRAITS] traits!")
- return
- neutral_traits += trait
- all_traits += trait
+ neutral_quirks += quirk
+ all_quirks += quirk
else
- var/balance = GetTraitBalance()
- if(trait in positive_traits)
- positive_traits -= trait
- all_traits -= trait
- else if(trait in negative_traits)
+ var/balance = GetQuirkBalance()
+ if(quirk in positive_quirks)
+ positive_quirks -= quirk
+ all_quirks -= quirk
+ else if(quirk in negative_quirks)
if(balance + value < 0)
to_chat(user, "Refunding this would cause you to go below your balance!")
return
- negative_traits -= trait
- all_traits -= trait
+ negative_quirks -= quirk
+ all_quirks -= quirk
else if(value > 0)
- if(all_traits.len >= MAX_TRAITS)
- to_chat(user, "You can't have more than [MAX_TRAITS] traits!")
+ if(positive_quirks.len >= MAX_QUIRKS)
+ to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!")
return
if(balance - value < 0)
- to_chat(user, "You don't have enough balance to gain this trait!")
+ to_chat(user, "You don't have enough balance to gain this quirk!")
return
- positive_traits += trait
- all_traits += trait
+ positive_quirks += quirk
+ all_quirks += quirk
else
- if(all_traits.len >= MAX_TRAITS)
- to_chat(user, "You can't have more than [MAX_TRAITS] traits!")
- return
- negative_traits += trait
- all_traits += trait
- SetTraits(user)
+ negative_quirks += quirk
+ all_quirks += quirk
+ SetQuirks(user)
if("reset")
- all_traits = list()
- positive_traits = list()
- negative_traits = list()
- neutral_traits = list()
- SetTraits(user)
+ all_quirks = list()
+ positive_quirks = list()
+ negative_quirks = list()
+ neutral_quirks = list()
+ SetQuirks(user)
else
- SetTraits(user)
+ SetQuirks(user)
return TRUE
switch(href_list["task"])
@@ -1535,6 +1533,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
cit_toggles ^= DIGESTION_NOISES
//END CITADEL EDIT
+ if("ambientocclusion")
+ ambientocclusion = !ambientocclusion
+ if(parent && parent.screen && parent.screen.len)
+ var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
+ PM.filters -= AMBIENT_OCCLUSION
+ if(ambientocclusion)
+ PM.filters += AMBIENT_OCCLUSION
+
if("save")
save_preferences()
save_character()
@@ -1642,4 +1648,4 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(icon_updates)
character.update_body()
character.update_hair()
- character.update_body_parts()
\ No newline at end of file
+ character.update_body_parts()
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index d2efc477c6..f17ddf8b7c 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -130,6 +130,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["uses_glasses_colour"]>> uses_glasses_colour
S["clientfps"] >> clientfps
S["parallax"] >> parallax
+ S["ambientocclusion"] >> ambientocclusion
S["menuoptions"] >> menuoptions
S["enable_tips"] >> enable_tips
S["tip_delay"] >> tip_delay
@@ -160,6 +161,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
clientfps = sanitize_integer(clientfps, 0, 1000, 0)
parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
+ ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
ghost_form = sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form))
ghost_orbit = sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit))
ghost_accs = sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION)
@@ -210,6 +212,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["uses_glasses_colour"], uses_glasses_colour)
WRITE_FILE(S["clientfps"], clientfps)
WRITE_FILE(S["parallax"], parallax)
+ WRITE_FILE(S["ambientocclusion"], ambientocclusion)
WRITE_FILE(S["menuoptions"], menuoptions)
WRITE_FILE(S["enable_tips"], enable_tips)
WRITE_FILE(S["tip_delay"], tip_delay)
@@ -310,11 +313,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["job_engsec_med"] >> job_engsec_med
S["job_engsec_low"] >> job_engsec_low
- //Traits
- S["all_traits"] >> all_traits
- S["positive_traits"] >> positive_traits
- S["negative_traits"] >> negative_traits
- S["neutral_traits"] >> neutral_traits
+ //Quirks
+ S["all_quirks"] >> all_quirks
+ S["positive_quirks"] >> positive_quirks
+ S["negative_quirks"] >> negative_quirks
+ S["neutral_quirks"] >> neutral_quirks
//Citadel code
S["feature_genitals_use_skintone"] >> features["genitals_use_skintone"]
@@ -421,10 +424,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
job_engsec_med = sanitize_integer(job_engsec_med, 0, 65535, initial(job_engsec_med))
job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))
- all_traits = SANITIZE_LIST(all_traits)
- positive_traits = SANITIZE_LIST(positive_traits)
- negative_traits = SANITIZE_LIST(negative_traits)
- neutral_traits = SANITIZE_LIST(neutral_traits)
+ all_quirks = SANITIZE_LIST(all_quirks)
+ positive_quirks = SANITIZE_LIST(positive_quirks)
+ negative_quirks = SANITIZE_LIST(negative_quirks)
+ neutral_quirks = SANITIZE_LIST(neutral_quirks)
cit_character_pref_load(S)
@@ -491,11 +494,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["job_engsec_med"] , job_engsec_med)
WRITE_FILE(S["job_engsec_low"] , job_engsec_low)
- //Traits
- WRITE_FILE(S["all_traits"] , all_traits)
- WRITE_FILE(S["positive_traits"] , positive_traits)
- WRITE_FILE(S["negative_traits"] , negative_traits)
- WRITE_FILE(S["neutral_traits"] , neutral_traits)
+ //Quirks
+ WRITE_FILE(S["all_quirks"] , all_quirks)
+ WRITE_FILE(S["positive_quirks"] , positive_quirks)
+ WRITE_FILE(S["negative_quirks"] , negative_quirks)
+ WRITE_FILE(S["neutral_quirks"] , neutral_quirks)
cit_character_pref_save(S)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index b15109bcb1..9ab929ba20 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -81,12 +81,14 @@
/obj/item/clothing/equipped(mob/user, slot)
..()
-
+ if (!istype(user))
+ return
if(slot_flags & slotdefine2slotbit(slot)) //Was equipped to a valid slot for this item?
- for(var/variable in user_vars_to_edit)
- if(variable in user.vars)
- user_vars_remembered[variable] = user.vars[variable]
- user.vars[variable] = user_vars_to_edit[variable]
+ if (LAZYLEN(user_vars_to_edit))
+ for(var/variable in user_vars_to_edit)
+ if(variable in user.vars)
+ LAZYSET(user_vars_remembered, variable, user.vars[variable])
+ user.vv_edit_var(variable, user_vars_to_edit[variable])
/obj/item/clothing/examine(mob/user)
..()
@@ -285,4 +287,4 @@ BLIND // can't see anything
Shreds.desc = "The sad remains of what used to be [name]."
deconstruct(FALSE)
else
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index f9be63420f..44bba64d2f 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -365,6 +365,7 @@
scan_reagents = 1
flags_1 = NODROP_1
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+ resistance_flags = LAVA_PROOF | FIRE_PROOF
/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, src) && W != src && W.loc == user)
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 5e5e7a9c55..336881106e 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -93,7 +93,7 @@
MA.alpha = 180
MA.maptext = "[strength]k"
MA.color = "#64C864"
- MA.layer = AREA_LAYER
+ MA.layer = FLY_LAYER
pic.appearance = MA
flick_overlay(pic, list(user.client), 8)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 2e9b7f83f2..4bf68c3bd0 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -158,12 +158,20 @@
strip_delay = 100
dog_fashion = null
+/obj/item/clothing/head/helmet/roman/fake
+ desc = "An ancient helmet made of plastic and leather."
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
/obj/item/clothing/head/helmet/roman/legionaire
name = "roman legionaire helmet"
desc = "An ancient helmet made of bronze and leather. Has a red crest on top of it."
icon_state = "roman_c"
item_state = "roman_c"
+/obj/item/clothing/head/helmet/roman/legionaire/fake
+ desc = "An ancient helmet made of plastic and leather. Has a red crest on top of it."
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
/obj/item/clothing/head/helmet/gladiator
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 74d8a43347..2c03997a4a 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -321,4 +321,27 @@
name = "headress of Nemes"
desc = "Lavish space tomb not included."
icon_state = "nemes_headdress"
- icon_state = "nemes_headdress"
\ No newline at end of file
+ icon_state = "nemes_headdress"
+
+/obj/item/clothing/head/frenchberet
+ name = "french beret"
+ desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage military conflict, for some reason."
+ icon_state = "beretblack"
+
+/obj/item/clothing/head/frenchberet/speechModification(M)
+ if(copytext(M, 1, 2) != "*")
+ M = " [M]"
+ var/list/french_words = strings("french_replacement.json", "french")
+
+ for(var/key in french_words)
+ var/value = french_words[key]
+ if(islist(value))
+ value = pick(value)
+
+ M = replacetextEx(M, " [uppertext(key)]", " [uppertext(value)]")
+ M = replacetextEx(M, " [capitalize(key)]", " [capitalize(value)]")
+ M = replacetextEx(M, " [key]", " [value]")
+
+ if(prob(3))
+ M += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
+ return trim(M)
\ No newline at end of file
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 285639d64a..ad77f1d350 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -47,7 +47,7 @@
/obj/item/clothing/mask/fakemoustache/italian/speechModification(M)
if(copytext(M, 1, 2) != "*")
M = " [M]"
- var/list/italian_words = strings("word_replacement.json", "italian")
+ var/list/italian_words = strings("italian_replacement.json", "italian")
for(var/key in italian_words)
var/value = italian_words[key]
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 7a35a4761d..5a79cfdae3 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -126,7 +126,7 @@
if(user.transferItemToLoc(I, src))
jetpack = I
to_chat(user, "You successfully install the jetpack into [src].")
-
+ return
else if(istype(I, /obj/item/screwdriver))
if(!jetpack)
to_chat(user, "[src] has no jetpack installed.")
@@ -139,6 +139,8 @@
jetpack.forceMove(drop_location())
jetpack = null
to_chat(user, "You successfully remove the jetpack from [src].")
+ return
+ return ..()
/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
@@ -237,6 +239,9 @@
brightness_on = 7
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
+/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize()
+ . = ..()
+ AddComponent(/datum/component/armor_plate)
/obj/item/clothing/suit/space/hardsuit/mining
icon_state = "hardsuit-mining"
@@ -250,6 +255,10 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+/obj/item/clothing/suit/space/hardsuit/mining/Initialize()
+ . = ..()
+ AddComponent(/datum/component/armor_plate)
+
//Syndicate hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/syndi
name = "blood-red hardsuit helmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 37d48b484e..af6d2b6c5e 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -165,186 +165,6 @@
. = ..()
allowed = GLOB.detective_vest_allowed
-//Reactive armor
-/obj/item/clothing/suit/armor/reactive
- name = "reactive armor"
- desc = "Doesn't seem to do much for some reason."
- var/active = 0
- var/reactivearmor_cooldown_duration = 0 //cooldown specific to reactive armor
- var/reactivearmor_cooldown = 0
- icon_state = "reactiveoff"
- item_state = "reactiveoff"
- blood_overlay_type = "armor"
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- actions_types = list(/datum/action/item_action/toggle)
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- hit_reaction_chance = 50
-
-
-/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
- src.active = !( src.active )
- if (src.active)
- to_chat(user, "[src] is now active.")
- src.icon_state = "reactive"
- src.item_state = "reactive"
- else
- to_chat(user, "[src] is now inactive.")
- src.icon_state = "reactiveoff"
- src.item_state = "reactiveoff"
- src.add_fingerprint(user)
- return
-
-/obj/item/clothing/suit/armor/reactive/emp_act(severity)
- active = 0
- src.icon_state = "reactiveoff"
- src.item_state = "reactiveoff"
- reactivearmor_cooldown = world.time + 200
- ..()
-
-//When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!)
-/obj/item/clothing/suit/armor/reactive/teleport
- name = "reactive teleport armor"
- desc = "Someone separated our Research Director from his own head!"
- var/tele_range = 6
- var/rad_amount= 15
- reactivearmor_cooldown_duration = 100
-
-/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(!active)
- return 0
- if(prob(hit_reaction_chance))
- var/mob/living/carbon/human/H = owner
- if(world.time < reactivearmor_cooldown)
- owner.visible_message("The reactive teleport system is still recharging! It fails to teleport [H]!")
- return
- owner.visible_message("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!")
- var/list/turfs = new/list()
- for(var/turf/T in orange(tele_range, H))
- if(T.density)
- continue
- if(T.x>world.maxx-tele_range || T.x\ You are armed with powerful medical tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \ Your hypospray will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \ diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index bdcde185d7..9926bc35fc 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1,7 +1,7 @@ /obj/item/robot_module name = "Default" icon = 'icons/obj/module.dmi' - icon_state = "std_module" + icon_state = "std_mod" w_class = WEIGHT_CLASS_GIGANTIC item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index f0cc8285e8..f47f936db7 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -164,12 +164,7 @@ update_controls() /mob/living/simple_animal/bot/floorbot/proc/empty_tiles() - var/atom/Tsec = drop_location() - - while(specialtiles > initial(tiletype.max_amount)) - new tiletype(Tsec,initial(tiletype.max_amount)) - specialtiles -= initial(tiletype.max_amount) - new tiletype(Tsec,specialtiles) + new tiletype(drop_location(), specialtiles) specialtiles = 0 tiletype = null @@ -378,8 +373,7 @@ if(prob(50)) drop_part(robot_arm, Tsec) - var/obj/item/stack/tile/plasteel/T = new (Tsec) - T.amount = 1 + new /obj/item/stack/tile/plasteel(Tsec, 1) do_sparks(3, TRUE, src) ..() diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index de7874351a..65b78bf844 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -2,7 +2,7 @@ name = "\improper honkbot" desc = "A little robot. It looks happy with its bike horn." icon = 'icons/mob/aibots.dmi' - icon_state = "honkbot" + icon_state = "honkbot1" density = FALSE anchored = FALSE health = 25 diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 6dc76bb6a7..214ced3613 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -27,6 +27,7 @@ attacktext = "pummels" attack_sound = 'sound/weapons/punch1.ogg' dextrous = TRUE + held_items = list(null, null) possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM) faction = list("jungle") robust_searching = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 4c9c916085..4917d3b74d 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -9,7 +9,7 @@ icon_dead = "Fugu_dead" icon_gib = "syndicate_gib" mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) - mouse_opacity = MOUSE_OPACITY_OPAQUE + mouse_opacity = MOUSE_OPACITY_ICON move_to_delay = 5 friendly = "floats near" speak_emote = list("puffs") diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 106381bade..0a0f27f123 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -146,12 +146,12 @@ else status_traits[trait] |= list(source) -/mob/living/proc/add_trait_datum(trait, spawn_effects) //separate proc due to the way these ones are handled - if(has_trait(trait)) +/mob/living/proc/add_quirk(quirk, spawn_effects) //separate proc due to the way these ones are handled + if(has_trait(quirk)) return - if(!SStraits || !SStraits.traits[trait]) + if(!SSquirks || !SSquirks.quirks[quirk]) return - var/datum/trait/T = SStraits.traits[trait] + var/datum/quirk/T = SSquirks.quirks[quirk] new T (src, spawn_effects) return TRUE @@ -180,8 +180,8 @@ if(!LAZYLEN(status_traits[trait])) status_traits -= trait -/mob/living/proc/remove_trait_datum(trait) - var/datum/trait/T = roundstart_traits[trait] +/mob/living/proc/remove_quirk(quirk) + var/datum/quirk/T = roundstart_quirks[quirk] if(T) qdel(T) return TRUE @@ -201,8 +201,8 @@ else if(LAZYLEN(status_traits[trait])) return TRUE -/mob/living/proc/has_trait_datum(trait) - return roundstart_traits[trait] +/mob/living/proc/has_quirk(quirk) + return roundstart_quirks[quirk] /mob/living/proc/remove_all_traits() status_traits = list() diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 9ad832debe..2718392b69 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -70,7 +70,7 @@ message = src.say_quote(message, get_spans()) var/rendered = "DEAD: [name][alt_name] " - + log_message("DEAD: [message]", INDIVIDUAL_SAY_LOG) deadchat_broadcast(rendered, follow_target = src, speaker_key = K) /mob/proc/check_emote(message) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c425ab8c61..ddfd878e2d 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -66,7 +66,7 @@ ..() to_chat(user, "Alt-click to fold it.") - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) + var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/paper) assets.send(user) if(in_range(user, src) || isobserver(user)) @@ -300,7 +300,10 @@ if(!in_range(src, user)) return - stamps += "  "
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/paper)
+ if (isnull(stamps))
+ stamps = sheet.css_tag()
+ stamps += sheet.icon_tag(P.icon_state)
var/mutable_appearance/stampoverlay = mutable_appearance('icons/obj/bureaucracy.dmi', "paper_[P.icon_state]")
stampoverlay.pixel_x = rand(-2, 2)
stampoverlay.pixel_y = rand(-3, 2)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index d17513ddf9..d4e92ac43a 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -34,6 +34,10 @@
#define APC_COVER_OPENED 1
#define APC_COVER_REMOVED 2
+#define APC_NOT_CHARGING 0
+#define APC_CHARGING 1
+#define APC_FULLY_CHARGED 2
+
// the Area Power Controller (APC), formerly Power Distribution Unit (PDU)
// one per area, needs wire connection to power network through a terminal
@@ -66,7 +70,7 @@
var/equipment = 3
var/environ = 3
var/operating = TRUE
- var/charging = 0
+ var/charging = APC_NOT_CHARGING
var/chargemode = 1
var/chargecount = 0
var/locked = TRUE
@@ -291,11 +295,11 @@
// And now, separately for cleanness, the lighting changing
if(update_state & UPSTATE_ALLGOOD)
switch(charging)
- if(0)
+ if(APC_NOT_CHARGING)
light_color = LIGHT_COLOR_RED
- if(1)
+ if(APC_CHARGING)
light_color = LIGHT_COLOR_BLUE
- if(2)
+ if(APC_FULLY_CHARGED)
light_color = LIGHT_COLOR_GREEN
set_light(lon_range)
else if(update_state & UPSTATE_BLUESCREEN)
@@ -339,9 +343,9 @@
if(!charging)
update_overlay |= APC_UPOVERLAY_CHARGEING0
- else if(charging == 1)
+ else if(charging == APC_CHARGING)
update_overlay |= APC_UPOVERLAY_CHARGEING1
- else if(charging == 2)
+ else if(charging == APC_FULLY_CHARGED)
update_overlay |= APC_UPOVERLAY_CHARGEING2
if (!equipment)
@@ -384,15 +388,6 @@
/obj/machinery/power/apc/crowbar_act(mob/user, obj/item/W)
. = TRUE
if (opened)
- if(cell)
- user.visible_message("[user] removes \the [cell] from [src]!","You remove \the [cell].")
- var/turf/T = get_turf(user)
- cell.forceMove(T)
- cell.update_icon()
- cell = null
- charging = 0
- update_icon()
- return
if (has_electronics == APC_ELECTRONICS_INSTALLED)
if (terminal)
to_chat(user, "Disconnect the wires first!")
@@ -457,8 +452,14 @@
/obj/machinery/power/apc/screwdriver_act(mob/living/user, obj/item/W)
. = TRUE
if(opened)
- if (cell)
- to_chat(user, "Close the APC first!")
+ if(cell)
+ user.visible_message("[user] removes \the [cell] from [src]!","You remove \the [cell].")
+ var/turf/T = get_turf(user)
+ cell.forceMove(T)
+ cell.update_icon()
+ cell = null
+ charging = APC_NOT_CHARGING
+ update_icon()
return
else
switch (has_electronics)
@@ -745,7 +746,7 @@
user.put_in_hands(cell)
cell.update_icon()
src.cell = null
- charging = 0
+ charging = APC_NOT_CHARGING
src.update_icon()
return
if((stat & MAINT) && !opened) //no board; no interface
@@ -888,7 +889,7 @@
if("charge")
chargemode = !chargemode
if(!chargemode)
- charging = 0
+ charging = APC_NOT_CHARGING
update_icon()
. = TRUE
if("channel")
@@ -1125,10 +1126,10 @@
if((cell.charge/GLOB.CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage?
cell.charge = min(cell.maxcharge, cell.charge + GLOB.CELLRATE * excess) //recharge with what we can
add_load(excess) // so draw what we can from the grid
- charging = 0
+ charging = APC_NOT_CHARGING
else // not enough power available to run the last tick!
- charging = 0
+ charging = APC_NOT_CHARGING
chargecount = 0
// This turns everything off in the case that there is still a charge left on the battery, just not enough to run the room.
equipment = autoset(equipment, 0)
@@ -1168,7 +1169,7 @@
area.poweralert(1, src)
// now trickle-charge the cell
- if(chargemode && charging == 1 && operating)
+ if(chargemode && charging == APC_CHARGING && operating)
if(excess > 0) // check to make sure we have enough to charge
// Max charge is capped to % per second constant
var/ch = min(excess*GLOB.CELLRATE, cell.maxcharge*GLOB.CHARGELEVEL)
@@ -1176,13 +1177,13 @@
cell.give(ch) // actually recharge the cell
else
- charging = 0 // stop charging
+ charging = APC_NOT_CHARGING // stop charging
chargecount = 0
// show cell as fully charged if so
if(cell.charge >= cell.maxcharge)
cell.charge = cell.maxcharge
- charging = 2
+ charging = APC_FULLY_CHARGED
if(chargemode)
if(!charging)
@@ -1194,7 +1195,7 @@
if(chargecount == 10)
chargecount = 0
- charging = 1
+ charging = APC_CHARGING
else // chargemode off
charging = 0
@@ -1202,7 +1203,7 @@
else // no cell, switch everything off
- charging = 0
+ charging = APC_NOT_CHARGING
chargecount = 0
equipment = autoset(equipment, 0)
lighting = autoset(lighting, 0)
@@ -1358,6 +1359,10 @@
#undef APC_COVER_OPENED
#undef APC_COVER_REMOVED
+#undef APC_NOT_CHARGING
+#undef APC_CHARGING
+#undef APC_FULLY_CHARGED
+
//update_overlay
#undef APC_UPOVERLAY_CHARGEING0
#undef APC_UPOVERLAY_CHARGEING1
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 7cea950ccc..7a6e313cd0 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -111,13 +111,8 @@
/obj/machinery/power/port_gen/pacman/DropFuel()
if(sheets)
- var/fail_safe = FALSE
- while(sheets > 0 && fail_safe < 100)
- fail_safe += 1
- var/obj/item/stack/sheet/S = new sheet_path(loc)
- var/amount = min(sheets, S.max_amount)
- S.amount = amount
- sheets -= amount
+ new sheet_path(drop_location(), sheets)
+ sheets = 0
/obj/machinery/power/port_gen/pacman/UseFuel()
var/needed_sheets = 1 / (time_per_sheet * consumption / power_output)
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index f4c11009d1..d7e0bc66bc 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -191,12 +191,12 @@
// Give back the glass type we were supplied with
/obj/item/solar_assembly/proc/give_glass(device_broken)
+ var/atom/Tsec = drop_location()
if(device_broken)
- new /obj/item/shard(loc)
- new /obj/item/shard(loc)
+ new /obj/item/shard(Tsec)
+ new /obj/item/shard(Tsec)
else if(glass_type)
- var/obj/item/stack/sheet/S = new glass_type(loc)
- S.amount = 2
+ new glass_type(Tsec, 2)
glass_type = null
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 32d35b4392..11b0c0c295 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -62,9 +62,9 @@
if(default_deconstruction_crowbar(W))
return
- if(is_wire_tool(W) && panel_open)
+ /*if(is_wire_tool(W) && panel_open) CITADEL EDIT - They removed the wires because they don't like my cheating
wires.interact(user)
- return
+ return*/
return ..()
@@ -185,4 +185,4 @@
flick("grounding_rodhit", src)
tesla_buckle_check(power)
else
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index dc8d0175ba..bb04446129 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -1,8 +1,8 @@
/obj/item/ammo_box/magazine/m12g
- name = "shotgun magazine (12g taser slugs)"
+ name = "shotgun magazine (12g buckshot slugs)"
desc = "A drum magazine."
- icon_state = "m12gs"
- ammo_type = /obj/item/ammo_casing/shotgun/stunslug
+ icon_state = "m12gb"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
caliber = "shotgun"
max_ammo = 8
@@ -10,14 +10,14 @@
..()
icon_state = "[initial(icon_state)]-[CEILING(ammo_count(0)/8, 1)*8]"
-/obj/item/ammo_box/magazine/m12g/buckshot
- name = "shotgun magazine (12g buckshot slugs)"
- icon_state = "m12gb"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+/obj/item/ammo_box/magazine/m12g/stun
+ name = "shotgun magazine (12g taser slugs)"
+ icon_state = "m12gs"
+ ammo_type = /obj/item/ammo_casing/shotgun/stunslug
/obj/item/ammo_box/magazine/m12g/slug
name = "shotgun magazine (12g slugs)"
- icon_state = "m12gb"
+ icon_state = "m12gb" //this may need an unique sprite
ammo_type = /obj/item/ammo_casing/shotgun
/obj/item/ammo_box/magazine/m12g/dragon
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 995fe2d2b1..8d309a13bb 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -40,7 +40,6 @@
to_chat(user, "You need a free hand to hold the gun!")
return
update_icon()
- gun.forceMove(user)
user.update_inv_back()
else
to_chat(user, "You are already holding the gun!")
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index 9339887e2f..727e9b6bf3 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -436,7 +436,7 @@
/obj/item/projectile/beam/beam_rifle
name = "particle beam"
- icon = ""
+ icon = null
hitsound = 'sound/effects/explosion3.ogg'
damage = 0 //Handled manually.
damage_type = BURN
diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm
index e5ac8126dd..adce5dad57 100644
--- a/code/modules/projectiles/projectile/special/curse.dm
+++ b/code/modules/projectiles/projectile/special/curse.dm
@@ -4,7 +4,7 @@
/obj/item/projectile/curse_hand
name = "curse hand"
- icon_state = "cursehand"
+ icon_state = "cursehand0"
hitsound = 'sound/effects/curse4.ogg'
layer = LARGE_MOB_LAYER
damage_type = BURN
@@ -19,10 +19,7 @@
/obj/item/projectile/curse_hand/Initialize(mapload)
. = ..()
handedness = prob(50)
- update_icon()
-
-/obj/item/projectile/curse_hand/update_icon()
- icon_state = "[icon_state][handedness]"
+ icon_state = "cursehand[handedness]"
/obj/item/projectile/curse_hand/fire(setAngle)
if(starting)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 2db6058852..20db99fca1 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -433,7 +433,8 @@ obj/machinery/chem_dispenser/proc/work_animation()
"orangejuice",
"limejuice",
"tomatojuice",
- "lemonjuice"
+ "lemonjuice",
+ "menthol"
)
emagged_reagents = list(
"thirteenloko",
@@ -465,7 +466,8 @@ obj/machinery/chem_dispenser/proc/work_animation()
"hcider",
"creme_de_menthe",
"creme_de_cacao",
- "triple_sec"
+ "triple_sec",
+ "sake"
)
emagged_reagents = list(
"ethanol",
@@ -499,3 +501,17 @@ obj/machinery/chem_dispenser/proc/work_animation()
"ammonia",
"ash",
"diethylamine")
+
+/obj/machinery/chem_dispenser/fullupgrade //fully upgraded stock parts
+
+/obj/machinery/chem_dispenser/fullupgrade/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null)
+ component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
+ component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
+ component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
+ component_parts += new /obj/item/stock_parts/manipulator/femto(null)
+ component_parts += new /obj/item/stack/sheet/glass(null)
+ component_parts += new /obj/item/stock_parts/cell/bluespace(null)
+ RefreshParts()
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
new file mode 100644
index 0000000000..4c57eb3524
--- /dev/null
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -0,0 +1,85 @@
+/obj/machinery/chem_dispenser/chem_synthesizer //formerly SCP-294 made by mrty, but now only for testing purposes
+ name = "\improper debug chemical synthesizer"
+ desc = "If you see this, yell at adminbus."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "dispenser"
+ amount = 10
+ resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+ working_state = null
+ nopower_state = null
+ flags_1 = NODECONSTRUCT_1
+ var/static/list/shortcuts = list(
+ "meth" = "methamphetamine",
+ "tricord" = "tricordrazine"
+ )
+ var/mutable_appearance/top_overlay
+
+/obj/machinery/chem_dispenser/chem_synthesizer/Initialize()
+ . = ..()
+ GLOB.poi_list += src
+ top_overlay = mutable_appearance(icon, "disp_beaker", layer = ABOVE_ALL_MOB_LAYER)
+ update_icon()
+
+/obj/machinery/chem_dispenser/chem_synthesizer/update_icon()
+ cut_overlays()
+ add_overlay(top_overlay)
+
+/obj/machinery/chem_dispenser/chem_synthesizer/Destroy()
+ . = ..()
+ GLOB.poi_list -= src
+ QDEL_NULL(top_overlay)
+
+/obj/machinery/chem_dispenser/chem_synthesizer/display_beaker()
+ return
+
+/obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 315, master_ui, state)
+ ui.open()
+
+/obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)
+ if(..())
+ return
+ update_icon()
+ switch(action)
+ if("ejectBeaker")
+ if(beaker)
+ beaker.forceMove(drop_location())
+ if(Adjacent(usr) && !issilicon(usr))
+ usr.put_in_hands(beaker)
+ beaker = null
+ . = TRUE
+ if("input")
+ var/input_reagent = replacetext(lowertext(input("Enter the name of any liquid", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+ if(shortcuts[input_reagent])
+ input_reagent = shortcuts[input_reagent]
+ else
+ input_reagent = find_reagent(input_reagent)
+ if(!input_reagent || !GLOB.chemical_reagents_list[input_reagent])
+ say("OUT OF RANGE")
+ return
+ else
+ if(!beaker)
+ return
+ else if(!beaker.reagents && !QDELETED(beaker))
+ beaker.create_reagents(beaker.volume)
+ beaker.reagents.add_reagent(input_reagent, amount)
+ if("makecup")
+ if(beaker)
+ return
+ beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+ visible_message("[src] dispenses a bluespace beaker.")
+
+/obj/machinery/chem_dispenser/chem_synthesizer/proc/find_reagent(input)
+ . = FALSE
+ if(GLOB.chemical_reagents_list[input]) //prefer IDs!
+ var/datum/reagent/R = GLOB.chemical_reagents_list[input]
+ if(R.can_synth_debug)
+ return input
+ else
+ for(var/X in GLOB.chemical_reagents_list)
+ var/datum/reagent/R = GLOB.chemical_reagents_list[X]
+ if(R.can_synth_debug && input == replacetext(lowertext(R.name), " ", ""))
+ return X
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 7369fd6042..f61644db0c 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -20,7 +20,8 @@
var/current_cycle = 0
var/volume = 0
var/color = "#000000" // rgb: 0, 0, 0
- var/can_synth = TRUE
+ var/can_synth = TRUE // can this reagent be synthesized? (for example: odysseus syringe gun)
+ var/can_synth_debug = TRUE // can this reagent be synthesized by the debug chem synthesizer?
var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
var/overrides_metab = 0
var/overdose_threshold = 0
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 4be808f873..5230ea26f6 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -1546,4 +1546,70 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."
/datum/reagent/consumable/ethanol/crevice_spike/on_mob_add(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out
- L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
\ No newline at end of file
+ L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
+
+/datum/reagent/consumable/ethanol/sake
+ name = "Sake"
+ id = "sake"
+ description = "A sweet rice wine of questionable legality and extreme potency."
+ color = "#DDDDDD"
+ boozepwr = 70
+ taste_description = "sweet rice wine"
+ glass_icon_state = "sakecup"
+ glass_name = "cup of sake"
+ glass_desc = "A traditional cup of sake."
+
+/datum/reagent/consumable/ethanol/alexander
+ name = "Alexander"
+ id = "alexander"
+ description = "A creamy, indulgent delight that is stronger than it seems."
+ color = "#F5E9D3"
+ boozepwr = 80
+ taste_description = "bitter, creamy cacao"
+ glass_icon_state = "alexander"
+ glass_name = "Alexander"
+ glass_desc = "A creamy, indulgent delight that is stronger than it seems."
+
+/datum/reagent/consumable/ethanol/sidecar
+ name = "Sidecar"
+ id = "sidecar"
+ description = "The one ride you’ll gladly give up the wheel for."
+ color = "#FFC55B"
+ boozepwr = 80
+ taste_description = "delicious freedom"
+ glass_icon_state = "sidecar"
+ glass_name = "Sidecar"
+ glass_desc = "The one ride you’ll gladly give up the wheel for."
+
+/datum/reagent/consumable/ethanol/between_the_sheets
+ name = "Between the Sheets"
+ id = "between_the_sheets"
+ description = "A provocatively named classic."
+ color = "#F4C35A"
+ boozepwr = 80
+ taste_description = "seduction"
+ glass_icon_state = "between_the_sheets"
+ glass_name = "Between the Sheets"
+ glass_desc = "A provocatively named classic."
+
+/datum/reagent/consumable/ethanol/kamikaze
+ name = "Kamikaze"
+ id = "kamikaze"
+ description = "Divinely windy."
+ color = "#EEF191"
+ boozepwr = 60
+ taste_description = "divine windiness"
+ glass_icon_state = "kamikaze"
+ glass_name = "Kamikaze"
+ glass_desc = "Divinely windy."
+
+/datum/reagent/consumable/ethanol/mojito
+ name = "Mojito"
+ id = "mojito"
+ description = "A drink that looks as refreshing as it tastes."
+ color = "#DFFAD9"
+ boozepwr = 30
+ taste_description = "refreshing mint"
+ glass_icon_state = "mojito"
+ glass_name = "Mojito"
+ glass_desc = "A drink that looks as refreshing as it tastes."
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 673b6e7059..5d5fdf2183 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -721,3 +721,13 @@
description = "Milk for cool kids."
color = "#7D4E29"
taste_description = "chocolate milk"
+
+/datum/reagent/consumable/menthol
+ name = "Menthol"
+ id = "menthol"
+ description = "Tastes naturally minty, and imparts a very mild numbing sensation."
+ color = "#80AF9C"
+ taste_description = "mint"
+ glass_icon_state = "glass_green"
+ glass_name = "glass of menthol"
+ glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 32b96d2780..dd932f6215 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -57,15 +57,6 @@
..()
. = 1
-/datum/reagent/drug/menthol
- name = "Menthol"
- id = "menthol"
- description = "Tastes naturally minty, and imparts a very mild numbing sensation."
- taste_description = "mint"
- reagent_state = LIQUID
- color = "#80AF9C"
- trippy = FALSE
-
/datum/reagent/drug/crank
name = "Crank"
id = "crank"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 6a57ff0c18..81d55830d2 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -171,8 +171,7 @@
else if(istype(O, /obj/item/stack/sheet/hairlesshide))
var/obj/item/stack/sheet/hairlesshide/HH = O
- var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
- WL.amount = HH.amount
+ new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
qdel(HH)
/*
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 0972f32ad7..9d5c6c5a0f 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -728,7 +728,7 @@
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/M)
if(M.hud_used)
if(current_cycle >= 20 && current_cycle%20 == 0)
- var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+ var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
var/rotation = min(round(current_cycle/20), 89) // By this point the player is probably puking and quitting anyway
for(var/whole_screen in screens)
animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
@@ -737,7 +737,7 @@
/datum/reagent/toxin/rotatium/on_mob_delete(mob/living/M)
if(M && M.hud_used)
- var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+ var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
for(var/whole_screen in screens)
animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
..()
@@ -755,7 +755,7 @@
/datum/reagent/toxin/skewium/on_mob_life(mob/living/M)
if(M.hud_used)
if(current_cycle >= 5 && current_cycle % 3 == 0)
- var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+ var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
var/matrix/skew = matrix()
var/intensity = 8
skew.set_skew(rand(-intensity,intensity), rand(-intensity,intensity))
@@ -772,7 +772,7 @@
/datum/reagent/toxin/skewium/on_mob_delete(mob/living/M)
if(M && M.hud_used)
- var/list/screens = list(M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+ var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
for(var/whole_screen in screens)
animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
..()
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 1268b2be87..997d957a4e 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -51,8 +51,9 @@ other types of metals and chemistry for reagents).
return ..()
/datum/design/proc/icon_html(client/user)
- send_asset(user, "design_[id].png", FALSE)
- return "![](\"design_[id].png\") "
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
+ sheet.send(user)
+ return sheet.icon_tag(id)
////////////////////////////////////////
//Disks for transporting design datums//
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index d1bcb952aa..28609e921d 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -126,42 +126,47 @@
/datum/design/apc_board
name = "APC Module"
id = "power control"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
build_path = /obj/item/electronics/apc
category = list("initial", "Electronics")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/airlock_board
name = "Airlock Electronics"
id = "airlock_board"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/electronics/airlock
category = list("initial", "Electronics")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/firelock_board
name = "Firelock Circuitry"
id = "firelock_board"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/electronics/firelock
category = list("initial", "Electronics")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/airalarm_electronics
name = "Air Alarm Electronics"
id = "airalarm_electronics"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/electronics/airalarm
category = list("initial", "Electronics")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/firealarm_electronics
name = "Fire Alarm Electronics"
id = "firealarm_electronics"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/electronics/firealarm
category = list("initial", "Electronics")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/camera
name = "Camera"
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 8f79bb9a6d..fd3eefbde1 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -354,3 +354,17 @@
build_path = /obj/item/weldingtool/experimental
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/////////////////////////////////////////
+////////////Armour//////////////
+/////////////////////////////////////////
+
+/datum/design/reactive_armour
+ name = "Reactive Armour Shell"
+ desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user."
+ id = "reactive_armour"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 10000, MAT_DIAMOND = 5000, MAT_URANIUM = 8000, MAT_SILVER = 4500, MAT_GOLD = 5000)
+ build_path = /obj/item/reactive_armour_shell
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
\ No newline at end of file
diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm
index 821e6cee38..79a9748b08 100644
--- a/code/modules/research/designs/smelting_designs.dm
+++ b/code/modules/research/designs/smelting_designs.dm
@@ -21,15 +21,23 @@
name = "Plasma + Glass alloy"
id = "plasmaglass"
build_type = SMELTER
- materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plasmaglass
category = list("initial")
+/datum/design/plasmarglass_alloy
+ name = "Plasma + Metal + Glass alloy"
+ id = "plasmareinforcedglass"
+ build_type = SMELTER
+ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_METAL = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/plasmarglass
+ category = list("initial")
+
/datum/design/titaniumglass_alloy
name = "Titanium + Glass alloy"
id = "titaniumglass"
build_type = SMELTER
- materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/titaniumglass
category = list("initial")
@@ -37,7 +45,7 @@
name = "Plasma + Titanium + Glass alloy"
id = "plastitaniumglass"
build_type = SMELTER
- materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plastitaniumglass
category = list("initial")
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 6c85a16498..db08c9b950 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -217,6 +217,8 @@ doesn't have toxins access.
/obj/machinery/computer/rdconsole/proc/ui_header()
var/list/l = list()
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
+ l += "[sheet.css_tag()][RDSCREEN_NOBREAK]"
l += "[stored_research.organization] Research and Development Network"
l += "Available points: [round(stored_research.research_points)] (+[round(stored_research.last_bitcoins * 60)] / minute)"
l += "Security protocols: [obj_flags & EMAGGED ? "Disabled" : "Enabled"]"
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index e8ba52495b..c29c8b7732 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -93,7 +93,7 @@
description = "A refresher course on modern engineering technology."
prereq_ids = list("base")
design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin",
- "atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", "apc_control", "cell_charger")
+ "atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics")
research_cost = 7500
export_price = 5000
@@ -106,6 +106,15 @@
research_cost = 2500
export_price = 5000
+/datum/techweb_node/anomaly
+ id = "anomaly_research"
+ display_name = "Anomaly Research"
+ description = "Unlock the potential of the mysterious anomalies that appear on station."
+ prereq_ids = list("adv_engi", "practical_bluespace")
+ design_ids = list("reactive_armour")
+ research_cost = 2500
+ export_price = 5000
+
/datum/techweb_node/high_efficiency
id = "high_efficiency"
display_name = "High Efficiency Parts"
@@ -153,7 +162,6 @@
research_cost = 5000
export_price = 5000
-
/datum/techweb_node/bluespace_power
id = "bluespace_power"
display_name = "Bluespace Power Technology"
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index ddbfdb8471..1c8e9ac350 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -448,8 +448,7 @@ datum/status_effect/stabilized/blue/on_remove()
else if(istype(O, /obj/item/stack/sheet/hairlesshide))
to_chat(owner, "[linked_extract] kept your hands wet! It wets [O]!")
var/obj/item/stack/sheet/hairlesshide/HH = O
- var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
- WL.amount = HH.amount
+ new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
qdel(HH)
..()
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index 68aff64ee9..18b4e81398 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -66,10 +66,8 @@ Charged extracts:
colour = "metal"
/obj/item/slimecross/charged/metal/do_effect(mob/user)
- var/obj/item/stack/sheet/metal/M = new(get_turf(user))
- M.amount = 25
- var/obj/item/stack/sheet/plasteel/P = new(get_turf(user))
- P.amount = 10
+ new /obj/item/stack/sheet/metal(get_turf(user), 25)
+ new /obj/item/stack/sheet/plasteel(get_turf(user), 10)
user.visible_message("[src] grows into a plethora of metals!")
..()
@@ -85,8 +83,7 @@ Charged extracts:
colour = "dark purple"
/obj/item/slimecross/charged/darkpurple/do_effect(mob/user)
- var/obj/item/stack/sheet/mineral/plasma/M = new(get_turf(user))
- M.amount = 10
+ new /obj/item/stack/sheet/mineral/plasma(get_turf(user), 10)
user.visible_message("[src] produces a large amount of plasma!")
..()
@@ -113,8 +110,7 @@ Charged extracts:
colour = "bluespace"
/obj/item/slimecross/charged/bluespace/do_effect(mob/user)
- var/obj/item/stack/sheet/bluespace_crystal/M = new(get_turf(user))
- M.amount = 10
+ new /obj/item/stack/sheet/bluespace_crystal(get_turf(user), 10)
user.visible_message("[src] produces several sheets of polycrystal!")
..()
@@ -138,8 +134,7 @@ Charged extracts:
colour = "pyrite"
/obj/item/slimecross/charged/pyrite/do_effect(mob/user)
- var/obj/item/stack/sheet/mineral/bananium/M = new(get_turf(user))
- M.amount = 10
+ new /obj/item/stack/sheet/mineral/bananium(get_turf(user), 10)
user.visible_message("[src] solidifies with a horrifying banana stench!")
..()
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index 2503219e83..95f87ede0a 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -75,12 +75,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/metal
colour = "metal"
plasmarequired = 3
- itempath = /obj/item/stack/sheet/metal
-
-/obj/item/slimecross/industrial/metal/do_after_spawn(obj/item/spawned)
- var/obj/item/stack/sheet/metal/M = spawned
- if(istype(M))
- M.amount = 10
+ itempath = /obj/item/stack/sheet/metal/ten
/obj/item/slimecross/industrial/yellow
colour = "yellow"
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index ee02bd524f..89e513fd60 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -144,7 +144,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/smoke_spread = 0 //1 - harmless, 2 - harmful
var/smoke_amt = 0 //cropped at 10
- var/critfailchance = 0
var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2
action_icon = 'icons/mob/actions/actions_spells.dmi'
@@ -153,7 +152,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
base_action = /datum/action/spell_action/spell
/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
-
if(player_lock)
if(!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list))
to_chat(user, "You shouldn't have this spell! Something's wrong.")
@@ -168,15 +166,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
return 0
if(!skipcharge)
- switch(charge_type)
- if("recharge")
- if(charge_counter < charge_max)
- to_chat(user, still_recharging_msg)
- return 0
- if("charges")
- if(!charge_counter)
- to_chat(user, "[name] has no charges left.")
- return 0
+ if(!charge_check(user))
+ return 0
if(user.stat && !stat_allowed)
to_chat(user, "Not when you're incapacitated.")
@@ -236,6 +227,20 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
action.UpdateButtonIcon()
return 1
+/obj/effect/proc_holder/spell/proc/charge_check(mob/user, silent = FALSE)
+ switch(charge_type)
+ if("recharge")
+ if(charge_counter < charge_max)
+ if(!silent)
+ to_chat(user, still_recharging_msg)
+ return FALSE
+ if("charges")
+ if(!charge_counter)
+ if(!silent)
+ to_chat(user, "[name] has no charges left.")
+ return FALSE
+ return TRUE
+
/obj/effect/proc_holder/spell/proc/invocation(mob/user = usr) //spelling the spell out and setting it on recharge/reducing charges amount
switch(invocation_type)
if("shout")
@@ -297,10 +302,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
recharging = TRUE
if(sound)
playMagSound()
- if(prob(critfailchance))
- critfail(targets)
- else
- cast(targets,user=user)
+ cast(targets,user=user)
after_cast(targets)
if(action)
action.UpdateButtonIcon()
@@ -349,9 +351,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell/proc/cast(list/targets,mob/user = usr)
return
-/obj/effect/proc_holder/spell/proc/critfail(list/targets)
- return
-
/obj/effect/proc_holder/spell/proc/revert_cast(mob/user = usr) //resets recharge or readds a charge
switch(charge_type)
if("recharge")
@@ -500,25 +499,20 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell/proc/can_cast(mob/user = usr)
if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
- return 0
+ return FALSE
- switch(charge_type)
- if("recharge")
- if(charge_counter < charge_max)
- return 0
- if("charges")
- if(!charge_counter)
- return 0
+ if(!charge_check(user,TRUE))
+ return FALSE
if(user.stat && !stat_allowed)
- return 0
+ return FALSE
if(!ishuman(user))
if(clothes_req || human_req)
- return 0
+ return FALSE
if(nonabstract_req && (isbrain(user) || ispAI(user)))
- return 0
- return 1
+ return FALSE
+ return TRUE
/obj/effect/proc_holder/spell/self //Targets only the caster. Good for buffs and heals, but probably not wise for fireballs (although they usually fireball themselves anyway, honke)
range = -1 //Duh
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 2def02b4c0..bf402b7a6a 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -13,10 +13,7 @@
throwforce = 0
throw_range = 0
throw_speed = 0
-
-/obj/item/melee/touch_attack/Initialize()
- attached_spell = loc
- . = ..()
+ var/charges = 1
/obj/item/melee/touch_attack/attack(mob/target, mob/living/carbon/user)
if(!iscarbon(user)) //Look ma, no hands
@@ -29,13 +26,13 @@
/obj/item/melee/touch_attack/afterattack(atom/target, mob/user, proximity)
user.say(catchphrase)
playsound(get_turf(user), on_use_sound,50,1)
- if(attached_spell)
- attached_spell.attached_hand = null
- qdel(src)
+ charges--
+ if(charges <= 0)
+ qdel(src)
/obj/item/melee/touch_attack/Destroy()
if(attached_spell)
- attached_spell.attached_hand = null
+ attached_spell.on_hand_destroy(src)
return ..()
/obj/item/melee/touch_attack/disintegrate
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index 2000d8daea..0ffe02cec2 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -1,37 +1,46 @@
/obj/effect/proc_holder/spell/targeted/touch
- var/hand_path = "/obj/item/melee/touch_attack"
+ var/hand_path = /obj/item/melee/touch_attack
var/obj/item/melee/touch_attack/attached_hand = null
invocation_type = "none" //you scream on connecting, not summoning
include_user = 1
range = -1
-/obj/effect/proc_holder/spell/targeted/touch/Click(mob/user = usr)
- if(attached_hand)
- qdel(attached_hand)
+/obj/effect/proc_holder/spell/targeted/touch/proc/remove_hand(recharge = FALSE)
+ QDEL_NULL(attached_hand)
+ if(recharge)
charge_counter = charge_max
- attached_hand = null
- to_chat(user, "You draw the power out of your hand.")
- return FALSE
- ..()
+
+/obj/effect/proc_holder/spell/targeted/touch/proc/on_hand_destroy(obj/item/melee/touch_attack/hand)
+ if(hand != attached_hand)
+ CRASH("Incorrect touch spell hand.")
+ //Start recharging.
+ attached_hand = null
+ recharging = TRUE
+ action.UpdateButtonIcon()
/obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr)
+ if(!QDELETED(attached_hand))
+ remove_hand(TRUE)
+ to_chat(user, "You draw the power out of your hand.")
+ return
+
for(var/mob/living/carbon/C in targets)
if(!attached_hand)
- if(!ChargeHand(C))
- return FALSE
- while(attached_hand)
- charge_counter = 0
- stoplag(1)
+ if(ChargeHand(C))
+ recharging = FALSE
+ return
-/obj/effect/proc_holder/spell/targeted/touch/can_cast(mob/user = usr)
- return ..() && attached_hand
+/obj/effect/proc_holder/spell/targeted/touch/charge_check(mob/user,silent = FALSE)
+ if(!QDELETED(attached_hand)) //Charge doesn't matter when putting the hand away.
+ return TRUE
+ else
+ return ..()
/obj/effect/proc_holder/spell/targeted/touch/proc/ChargeHand(mob/living/carbon/user)
attached_hand = new hand_path(src)
+ attached_hand.attached_spell = src
if(!user.put_in_hands(attached_hand))
- qdel(attached_hand)
- charge_counter = charge_max
- attached_hand = null
+ remove_hand(TRUE)
to_chat(user, "Your hands are full!")
return FALSE
to_chat(user, "You channel the power of the spell to your hand.")
@@ -41,7 +50,7 @@
/obj/effect/proc_holder/spell/targeted/touch/disintegrate
name = "Disintegrate"
desc = "This spell charges your hand with vile energy that can be used to violently explode victims."
- hand_path = "/obj/item/melee/touch_attack/disintegrate"
+ hand_path = /obj/item/melee/touch_attack/disintegrate
school = "evocation"
charge_max = 600
@@ -53,7 +62,7 @@
/obj/effect/proc_holder/spell/targeted/touch/flesh_to_stone
name = "Flesh to Stone"
desc = "This spell charges your hand with the power to turn victims into inert statues for a long period of time."
- hand_path = "/obj/item/melee/touch_attack/fleshtostone"
+ hand_path = /obj/item/melee/touch_attack/fleshtostone
school = "transmutation"
charge_max = 600
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index 5110b98e8e..ab7dc91739 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -42,6 +42,8 @@ Notes:
/datum/tooltip/New(client/C)
if (C)
owner = C
+ var/datum/asset/stuff = get_asset_datum(/datum/asset/simple/jquery)
+ stuff.send(owner)
owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]")
..()
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 92ce23c6c4..6a8ccefd19 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -453,7 +453,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/shotgun/buck
name = "12g Buckshot Drum"
desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
- item = /obj/item/ammo_box/magazine/m12g/buckshot
+ item = /obj/item/ammo_box/magazine/m12g
/datum/uplink_item/ammo/shotgun/slug
name = "12g Slug Drum"
@@ -466,7 +466,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "12g Stun Slug Drum"
desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \
Saying that they're completely non-lethal would be lying."
- item = /obj/item/ammo_box/magazine/m12g
+ item = /obj/item/ammo_box/magazine/m12g/stun
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/dragon
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 889b159762..c0cfe661d7 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -114,11 +114,11 @@
/obj/item/clothing/mask/muzzle = 2)
premium = list(/obj/item/clothing/suit/pirate/captain = 2,
/obj/item/clothing/head/pirate/captain = 2,
- /obj/item/clothing/head/helmet/roman = 1,
- /obj/item/clothing/head/helmet/roman/legionaire = 1,
+ /obj/item/clothing/head/helmet/roman/fake = 1,
+ /obj/item/clothing/head/helmet/roman/legionaire/fake = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
- /obj/item/shield/riot/roman = 1,
+ /obj/item/shield/riot/roman/fake = 1,
/obj/item/skub = 1)
refill_canister = /obj/item/vending_refill/autodrobe
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index eddb01171b..59b41d4cef 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -19,6 +19,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
+ /obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
@@ -37,5 +38,5 @@
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
- charges = list(58, 4, 0)//of 174 standard, 12 contraband
- init_charges = list(58, 4, 0)
+ charges = list(59, 4, 0)//of 178 standard, 12 contraband
+ init_charges = list(59, 4, 0)
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index a990ee901f..0e2b31037f 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -13,7 +13,10 @@
/obj/item/stock_parts/cell/high = 10,
/obj/item/electronics/airlock = 10,
/obj/item/electronics/apc = 10,
- /obj/item/electronics/airalarm = 10)
+ /obj/item/electronics/airalarm = 10,
+ /obj/item/electronics/firealarm = 10,
+ /obj/item/electronics/firelock = 10
+ )
contraband = list(/obj/item/stock_parts/cell/potato = 3)
premium = list(/obj/item/storage/belt/utility = 3,
/obj/item/storage/box/smart_metal_foam = 1)
diff --git a/config/admins.txt b/config/admins.txt
index ca77fd3f4a..807b4d89d5 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -7,3 +7,133 @@
# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn #
# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
###############################################################################################
+<<<<<<< HEAD
+=======
+Optimumtact = Host
+NewSta = Game Master
+Expletives = Game Master
+kingofkosmos = Game Master
+MrStonedOne = Lazy Master
+microscopics = Game Master
+Gun Hog = Game Master
+KorPhaeron = Game Master
+razharas = Game Master
+Lordpidey = Game Master
+Niknakflak = Game Master
+rolan7 = Game Master
+quarxink = Game Master
+adrix89 = Game Master
+tle = Game Master
+xsi = Game Master
+scaredofshadows = Game Master
+neofite = Game Master
+trubblebass = Game Master
+mport2004 = Game Master
+deuryn = Game Master
+agouri = Game Master
+errorage = Game Master
+superxpdude = Game Master
+petethegoat = Game Master
+nodrak = Game Master
+carnwennan = Game Master
+ikarrus = Game Master
+cheridan = Game Master
+giacomand = Game Master
+rockdtben = Game Master
+sieve = Game Master
+aranclanos = Game Master
+intigracy = Game Master
+dumpdavidson = Game Master
+kazeespada = Game Master
+malkevin = Game Master
+incoming = Game Master
+demas = Game Master
+fleure = Game Master
+ricotez = Game Master
+misterperson = Game Master
+crimsonvision = Game Master
+iamgoofball = Game Master
+zelacks = Game Master
+androidsfv = Game Master
+miggles = Game Master
+jordie0608 = Game Master
+s0ldi3rkr4s0 = Game Master
+ergovisavi = Game Master
+vistapowa = Game Master
+miauw62 = Game Master
+rumia29 = Game Master
+bobylein = Game Master
+sirbayer = Game Master
+hornygranny = Game Master
+yota = Game Master
+firecage = Game Master
+donkieyo = Game Master
+argoneus = Game Master
+paprka = Game Master
+cookingboy3 = Game Master
+limeliz = Game Master
+steelpoint = Game Master
+phil235 = Game Master
+CorruptComputer = Game Master
+xxnoob = Game Master
+tkdrg = Game Master
+Cuboos = Game Master
+thunder12345 = Game Master
+wjohnston = Game Master
+mandurrh = Game Master
+thurgatar = Game Master
+xerux = Game Master
+dannno = Game Master
+lo6a4evskiy = Game Master
+vekter = Game Master
+Ahammer18 = Game Master
+ACCount12 = Game Master
+fayrik = Game Master
+shadowlight213 = Game Master
+drovidicorv = Game Master
+Dunc = Game Master
+MMMiracles = Game Master
+bear1ake = Game Master
+CoreOverload = Game Master
+Jalleo = Game Master
+ChangelingRain = Game Master
+FoxPMcCloud = Game Master
+Xhuis = Game Master
+Astralenigma = Game Master
+Tokiko1 = Game Master
+SuperSayu = Game Master
+Lzimann = Game Master
+As334 = Game Master
+neersighted = Game Master
+Swankcookie = Game Master
+Ressler = Game Master
+Folix = Game Master
+Bawhoppennn = Game Master
+Anturke = Host
+Lumipharon = Game Master
+bgobandit = Game Master
+coiax = Game Master
+RandomMarine = Game Master
+PKPenguin321 = Game Master
+TechnoAlchemist = Game Master
+Aloraydrel = Game Master
+Quiltyquilty = Game Master
+SnipeDragon = Game Master
+Fjeld = Game Master
+kevinz000 = Game Master
+Tacolizard = Game Master
+TrustyGun = Game Master
+Cyberboss = Game Master
+PJB3005 = Game Master
+Sweaterkittens = Game Master
+Feemjmeem = Game Master
+JStheguy = Game Master
+excessiveuseofcobby = Game Master
+Plizzard = Game Master
+octareenroon91 = Game Master
+Serpentarium = Game Master
+Averagejoe82 = Game Master
+The Dreamweaver = Game Master
+88Naoki = Game Master
+Naksuasdf = Game Master
+>>>>>>> 3653239... Merge pull request #37785 from 81Denton/circboard_spawners
diff --git a/config/game_options.txt b/config/game_options.txt
index 5f080a7f0f..6ecec1fc9e 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -536,7 +536,8 @@ ALLOW_MISCREANTS
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
-## Uncomment to allow roundstart trait selection in the character setup menu.
+## Uncomment to allow roundstart quirk selection in the character setup menu.
+## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
ROUNDSTART_TRAITS
## Uncomment to disable human moods.
diff --git a/html/changelogs/AutoChangeLog-pr-6663.yml b/html/changelogs/AutoChangeLog-pr-6663.yml
new file mode 100644
index 0000000000..97e977b062
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6663.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - tweak: "Character traits are now called character quirks. Functionality remains unaffected."
diff --git a/html/changelogs/AutoChangeLog-pr-6731.yml b/html/changelogs/AutoChangeLog-pr-6731.yml
new file mode 100644
index 0000000000..255a2ba3ad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6731.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "You may now take unlimited neutral and negative quirks"
diff --git a/html/changelogs/AutoChangeLog-pr-6744.yml b/html/changelogs/AutoChangeLog-pr-6744.yml
new file mode 100644
index 0000000000..761f59fb39
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6744.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixes missing curator hud icon."
diff --git a/html/changelogs/AutoChangeLog-pr-6745.yml b/html/changelogs/AutoChangeLog-pr-6745.yml
new file mode 100644
index 0000000000..2f3648f00a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6745.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - rscadd: "APC/air alarm/airlock/fire alarm/firelock electronics are now available once Industrial Engineering is researched.."
diff --git a/html/changelogs/AutoChangeLog-pr-6746.yml b/html/changelogs/AutoChangeLog-pr-6746.yml
new file mode 100644
index 0000000000..80c93a7305
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6746.yml
@@ -0,0 +1,5 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "Engi-Vend machines now contain fire alarm and firelock electronics!"
+ - code_imp: "Loose tech storage circuit boards have been replaced with spawners."
diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index 6b17cc3acb..7c7499ee42 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index d694c0243a..8fa3cefbb7 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/lavaland/64x64megafauna.dmi b/icons/mob/lavaland/64x64megafauna.dmi
index 64304fdcd1..1794c789de 100644
Binary files a/icons/mob/lavaland/64x64megafauna.dmi and b/icons/mob/lavaland/64x64megafauna.dmi differ
diff --git a/icons/mob/lavaland/lavaland_monsters.dmi b/icons/mob/lavaland/lavaland_monsters.dmi
index dac70998f5..f8394dd235 100644
Binary files a/icons/mob/lavaland/lavaland_monsters.dmi and b/icons/mob/lavaland/lavaland_monsters.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index f35ef2c1a5..23541a8e40 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi
index 5714953e3f..9cbc085624 100644
Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ
diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi
index 0e561b6ff8..df9517aeaa 100644
Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 3635744b6f..c6f6798076 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index de5fce96a5..419b14f526 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index 64fac1c3eb..c40dfaaa22 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index b3774b26ab..a053eab792 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index e94228f701..b4431daf83 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 2d0d35f8a5..84e9f78add 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/smooth_structures/clockwork_window.dmi b/icons/obj/smooth_structures/clockwork_window.dmi
index 90309ac3d5..10d5bcf631 100644
Binary files a/icons/obj/smooth_structures/clockwork_window.dmi and b/icons/obj/smooth_structures/clockwork_window.dmi differ
diff --git a/icons/obj/smooth_structures/sandbags.dmi b/icons/obj/smooth_structures/sandbags.dmi
index 2e8c2e3352..8ac099555a 100644
Binary files a/icons/obj/smooth_structures/sandbags.dmi and b/icons/obj/smooth_structures/sandbags.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index a1471e6418..f66480f3aa 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index a8a71e891d..4e78e0444b 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 2bb9c3a356..264dbfef0a 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -1,24 +1,24 @@
// Citadel-specific Neutral Traits
-/datum/trait/libido
+/datum/quirk/libido
name = "Nymphomania"
desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
value = 0
gain_text = "You are feeling extra wild."
lose_text = "You don't feel that burning sensation anymore."
-/datum/trait/libido/add()
- var/mob/living/M = trait_holder
+/datum/quirk/libido/add()
+ var/mob/living/M = quirk_holder
M.min_arousal = 16
M.arousal_rate = 3
-/datum/trait/libido/remove()
- var/mob/living/M = trait_holder
+/datum/quirk/libido/remove()
+ var/mob/living/M = quirk_holder
M.min_arousal = initial(M.min_arousal)
M.arousal_rate = initial(M.arousal_rate)
-/datum/trait/libido/on_process()
- var/mob/living/M = trait_holder
+/datum/quirk/libido/on_process()
+ var/mob/living/M = quirk_holder
if(M.canbearoused == FALSE)
- to_chat(trait_holder, "Having high libido is useless when you can't feel arousal at all!")
+ to_chat(quirk_holder, "Having high libido is useless when you can't feel arousal at all!")
qdel(src)
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index d3910d5554..6c2bd35020 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -278,3 +278,9 @@ datum/gear/darksabresheath
path = /obj/item/ssword_kit
ckeywhitelist = list("phillip458")
+/datum/gear/techcoat
+ name = "Techomancers Labcoat"
+ category = slot_in_backpack
+ path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
+ ckeywhitelist = list("wilchen")
+
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index 0abbba1845..c192804552 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -343,3 +343,11 @@
desc = "A piece of paper folded into neat little hat."
icon_state = "paperhat"
item_state = "paperhat"
+
+/obj/item/clothing/suit/toggle/labcoat/mad/techcoat
+ name = "Techomancers Labcoat"
+ desc = "An oddly special looking coat."
+ icon = 'icons/obj/custom.dmi'
+ icon_state = "rdcoat"
+ icon_override = 'icons/mob/custom_w.dmi'
+ item_state = "rdcoat"
diff --git a/rust_g.dll b/rust_g.dll
index 4e1df5afbd..44e38ef0dd 100644
Binary files a/rust_g.dll and b/rust_g.dll differ
diff --git a/strings/french_replacement.json b/strings/french_replacement.json
new file mode 100644
index 0000000000..4c89d98812
--- /dev/null
+++ b/strings/french_replacement.json
@@ -0,0 +1,91 @@
+{
+
+ "french": {
+ "yes": "oui",
+ "no": "non",
+ "I'm": "j'",
+ "am": "suis",
+ "a": "un",
+ "and": "et",
+ "the": "l'",
+ "I": "j'",
+ "for": "pour",
+ "with": "avec",
+ "of": "de",
+
+
+ "assistant": "ravageur",
+ "assistants": "ravageurs",
+ "baby": [
+ "enfant",
+ "petit baguette"
+ ],
+ "bad": "mal",
+ "bye": [
+ "bon voyage",
+ "adieu",
+ "au revoir"
+ ],
+ "cake": "gateau",
+ "captain": "capitaine",
+ "changeling": "changeur",
+ "cheese": [
+ "brie",
+ "roquefort",
+ "camembert"
+ ],
+ "cigarette": "clope",
+ "cook": "cuisinier",
+ "dad": "papa",
+ "enemy": "silly english dog",
+ "friend": "ami",
+ "good": "bon",
+ "greytide": "les gitans",
+ "greytider": "les gitans",
+ "greytiders": "les gitans",
+ "hardsuit": "burkini",
+ "hello": [
+ "'allo",
+ "bonjour",
+ "salut"
+ ],
+ "maint": "les banlieues",
+ "meat": [
+ "coq au vin",
+ "boeuf"
+ ],
+ "mom": "maman",
+ "my": "mon",
+ "nuke": [
+ "grand bombe",
+ "la baguette ultime"
+ ],
+ "op": "boche",
+ "operative": "boche",
+ "operatives": "boches",
+ "ops": "boches",
+ "urity": "urite",
+ "security": "securite",
+ "shit": "merde",
+ "shitcurity": [
+ "gendarmerie",
+ "les keufs"
+ ],
+ "shitsec": [
+ "gendarmerie",
+ "les keufs"
+ ],
+ "spaghetti": "macaroni",
+ "spicy": "epice",
+ "thanks": "merci",
+ "tomato": "tomate",
+ "traitor": "collaborateur",
+ "want": "envie",
+ "what's": "quel est",
+ "who's": "qui est",
+ "why": "porquois",
+ "wine": "vin",
+ "wizard": "sorcier"
+ }
+
+}
\ No newline at end of file
diff --git a/strings/word_replacement.json b/strings/italian_replacement.json
similarity index 99%
rename from strings/word_replacement.json
rename to strings/italian_replacement.json
index 9565ebe94a..42bef05a22 100644
--- a/strings/word_replacement.json
+++ b/strings/italian_replacement.json
@@ -1,4 +1,5 @@
{
+
"italian": {
"I'm": "I'm-a",
"am": "am-a",
@@ -62,5 +63,7 @@
"whose": "whose-a",
"why": "for-a what reason",
"wine": "vino"
- }
-}
+ }
+
+
+}
\ No newline at end of file
diff --git a/strings/names/wizardfirst.txt b/strings/names/wizardfirst.txt
index 8c9e1e35fe..f1e9a10a58 100644
--- a/strings/names/wizardfirst.txt
+++ b/strings/names/wizardfirst.txt
@@ -24,6 +24,7 @@ Prospero
Radagast
Raistlin
Rasputin
+Rincewind
Saruman
Tenser
Terefi
diff --git a/strings/names/wizardsecond.txt b/strings/names/wizardsecond.txt
index 4233ad5430..dd191cfa2b 100644
--- a/strings/names/wizardsecond.txt
+++ b/strings/names/wizardsecond.txt
@@ -34,6 +34,7 @@ the Unstoppable
the Weeping
the White
the Wise
+the Wizzard
Unseen
Weatherwax
Yagg
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index fd1de72cff..d356f887a4 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -261,7 +261,7 @@
#include "code\controllers\subsystem\processing\obj.dm"
#include "code\controllers\subsystem\processing\processing.dm"
#include "code\controllers\subsystem\processing\projectiles.dm"
-#include "code\controllers\subsystem\processing\traits.dm"
+#include "code\controllers\subsystem\processing\quirks.dm"
#include "code\controllers\subsystem\processing\wet_floors.dm"
#include "code\datums\action.dm"
#include "code\datums\ai_laws.dm"
@@ -316,6 +316,7 @@
#include "code\datums\components\_component.dm"
#include "code\datums\components\anti_magic.dm"
#include "code\datums\components\archaeology.dm"
+#include "code\datums\components\armor_plate.dm"
#include "code\datums\components\beauty.dm"
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
@@ -444,7 +445,7 @@
#include "code\datums\status_effects\gas.dm"
#include "code\datums\status_effects\neutral.dm"
#include "code\datums\status_effects\status_effect.dm"
-#include "code\datums\traits\_trait.dm"
+#include "code\datums\traits\_quirk.dm"
#include "code\datums\traits\good.dm"
#include "code\datums\traits\negative.dm"
#include "code\datums\traits\neutral.dm"
@@ -559,7 +560,6 @@
#include "code\game\machinery\rechargestation.dm"
#include "code\game\machinery\recycler.dm"
#include "code\game\machinery\requests_console.dm"
-#include "code\game\machinery\robot_fabricator.dm"
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\Sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
@@ -1433,6 +1433,7 @@
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
+#include "code\modules\clothing\suits\reactive_armour.dm"
#include "code\modules\clothing\suits\toggles.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\vg_suits.dm"
@@ -2332,6 +2333,7 @@
#include "code\modules\reagents\chemistry\machinery\chem_dispenser.dm"
#include "code\modules\reagents\chemistry\machinery\chem_heater.dm"
#include "code\modules\reagents\chemistry\machinery\chem_master.dm"
+#include "code\modules\reagents\chemistry\machinery\chem_synthesizer.dm"
#include "code\modules\reagents\chemistry\machinery\pandemic.dm"
#include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm"
#include "code\modules\reagents\chemistry\machinery\smoke_machine.dm"
diff --git a/tgui/src/interfaces/chem_synthesizer.ract b/tgui/src/interfaces/chem_synthesizer.ract
new file mode 100644
index 0000000000..f57bd4ba71
--- /dev/null
+++ b/tgui/src/interfaces/chem_synthesizer.ract
@@ -0,0 +1,21 @@
+ + {{else}} + Recipient Empty + {{/each}} + {{else}} + No Recipient + {{/if}} + |