Priority Announcement
" + src << "The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.
" + src << sound('sound/AI/shuttledock.ogg') + if(15) + src << 'sound/items/Welder.ogg' + if(16) + src << 'sound/items/Screwdriver.ogg' + if(17) + src << 'sound/weapons/saberon.ogg' + if(18) + src << 'sound/weapons/saberoff.ogg' + if("hudscrew") + //Screwy HUD + //src << "Screwy HUD" + hal_screwyhud = pick(1,2,3,3,4,4) + spawn(rand(100,250)) + hal_screwyhud = 0 + if("items") + //Strange items + //src << "Traitor Items" + if(!halitem) + halitem = new + var/list/slots_free = list(ui_lhand,ui_rhand) + if(l_hand) slots_free -= ui_lhand + if(r_hand) slots_free -= ui_rhand + if(istype(src,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = src + if(!H.belt) slots_free += ui_belt + if(!H.l_store) slots_free += ui_storage1 + if(!H.r_store) slots_free += ui_storage2 + if(slots_free.len) + halitem.screen_loc = pick(slots_free) + halitem.layer = 50 + switch(rand(1,6)) + if(1) //revolver + halitem.icon = 'icons/obj/guns/projectile.dmi' + halitem.icon_state = "revolver" + halitem.name = "Revolver" + if(2) //c4 + halitem.icon = 'icons/obj/assemblies.dmi' + halitem.icon_state = "plastic-explosive0" + halitem.name = "Mysterious Package" + if(prob(25)) + halitem.icon_state = "c4small_1" + if(3) //sword + halitem.icon = 'icons/obj/weapons.dmi' + halitem.icon_state = "sword1" + halitem.name = "Sword" + if(4) //stun baton + halitem.icon = 'icons/obj/weapons.dmi' + halitem.icon_state = "stunbaton" + halitem.name = "Stun Baton" + if(5) //emag + halitem.icon = 'icons/obj/card.dmi' + halitem.icon_state = "emag" + halitem.name = "Cryptographic Sequencer" + if(6) //flashbang + halitem.icon = 'icons/obj/grenade.dmi' + halitem.icon_state = "flashbang1" + halitem.name = "Flashbang" + if(client) client.screen += halitem + spawn(rand(100,250)) + qdel(halitem) + if("dangerflash") + //Flashes of danger + //src << "Danger Flash" + if(!halimage) + var/list/possible_points = list() + for(var/turf/simulated/floor/F in view(src,world.view)) + possible_points += F + if(possible_points.len) + var/turf/simulated/floor/target = pick(possible_points) + + switch(rand(1,3)) + if(1) + //src << "Space" + halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER) + if(2) + //src << "Fire" + halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER) + if(3) + //src << "C4" + halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01) + + + if(client) client.images += halimage + spawn(rand(10,50)) //Only seen for a brief moment. + if(client) client.images -= halimage + halimage = null + if("death") + //Fake death + src.sleeping = 20 + hal_crit = 1 + hal_screwyhud = 1 + spawn(rand(50,100)) + src.sleeping = 0 + hal_crit = 0 + hal_screwyhud = 0 + if("husks") + if(!halbody) + var/list/possible_points = list() + for(var/turf/simulated/floor/F in view(src,world.view)) + possible_points += F + if(possible_points.len) + var/turf/simulated/floor/target = pick(possible_points) + switch(rand(1,4)) + if(1) + var/image/body = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER) + var/matrix/M = matrix() + M.Turn(90) + body.transform = M + halbody = body + if(2,3) + halbody = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER) + if(4) + halbody = image('icons/mob/alien.dmi',target,"alienother",TURF_LAYER) + + if(client) client.images += halbody + spawn(rand(50,80)) //Only seen for a brief moment. + if(client) client.images -= halbody + halbody = null \ No newline at end of file diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index dbcff950089..1f07766a523 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -81,7 +81,7 @@ return var/refill = reagents.get_master_reagent_id() var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << " You transfer [trans] units of the solution to [target]." + user << "You transfer [trans] units of the solution to [target]." if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell var/mob/living/silicon/robot/bro = user diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm index 7f9387b9865..c2aa2849c0a 100644 --- a/code/modules/food&drinks/food/customizables.dm +++ b/code/modules/food&drinks/food/customizables.dm @@ -44,7 +44,8 @@ else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume)) user << "You can't add more ingredients to [src]!" else - user.drop_item() + if(!user.unEquip(I)) + return if(S.trash) new S.trash(get_turf(user)) S.trash = null //we remove the plate before adding the ingredient diff --git a/code/modules/food&drinks/kitchen machinery/food_cart.dm b/code/modules/food&drinks/kitchen machinery/food_cart.dm index fdae544a1b9..1cff6be4b82 100644 --- a/code/modules/food&drinks/kitchen machinery/food_cart.dm +++ b/code/modules/food&drinks/kitchen machinery/food_cart.dm @@ -63,7 +63,8 @@ if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) var/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/DG = O if(!DG.reagents.total_volume) //glass is empty - user.drop_item() + if(!user.drop_item()) + return qdel(DG) glasses++ user << "The [src] accepts the drinking glass, sterilizing it." @@ -72,7 +73,8 @@ user << "The [src] is at full capacity." else var/obj/item/weapon/reagent_containers/food/snacks/S = O - user.drop_item() + if(!user.drop_item()) + return S.loc = src if(stored_food[sanitize(S.name)]) stored_food[sanitize(S.name)]++ diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm index bb88e5ec867..fc6a899f5b0 100644 --- a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm +++ b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm @@ -60,7 +60,8 @@ if(target.stat == 0) user << "The monkey is struggling far too much to put it in the recycler." else - user.drop_item() + if(!user.drop_item()) + return qdel(target) user << "You stuff the monkey in the machine." playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 3722cdda67f..38c9be4e471 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -897,7 +897,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user) squish(user) - user.drop_item() + user.unEquip(src) src.visible_message("[user] squashes the [src.name].","You hear a smack.") qdel(src) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index df14126ae63..07ee7c17a2e 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -89,7 +89,7 @@ qdel(src) return else - usr << " You must dry this first!" + usr << "You must dry this first!" /obj/item/weapon/grown/log/steel seed = /obj/item/seeds/steelmycelium @@ -115,7 +115,7 @@ /obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob) M << " [user] smacks you with a sunflower!FLOWER POWER" - user << " Your sunflower's FLOWER POWER strikes [M]" + user << "Your sunflower's FLOWER POWERstrikes [M]" /obj/item/weapon/grown/novaflower diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 608414b38c2..3b3b9ab28d2 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -684,25 +684,25 @@ else if(istype(O, /obj/item/device/analyzer/plant_analyzer)) if(planted && myseed) user << "*** [myseed.plantname] ***" //Carn: now reports the plants growing, not the seeds. - user << "-Plant Age: [age]" - user << "-Plant Endurance: [myseed.endurance]" - user << "-Plant Lifespan: [myseed.lifespan]" + user << "-Plant Age: [age]" + user << "-Plant Endurance: [myseed.endurance]" + user << "-Plant Lifespan: [myseed.lifespan]" if(myseed.yield != -1) - user << "-Plant Yield: [myseed.yield]" - user << "-Plant Production: [myseed.production]" + user << "-Plant Yield: [myseed.yield]" + user << "-Plant Production: [myseed.production]" if(myseed.potency != -1) - user << "-Plant Potency: [myseed.potency]" + user << "-Plant Potency: [myseed.potency]" var/list/text_strings = myseed.get_analyzer_text() if(text_strings) for(var/string in text_strings) user << string else user << "No plant found." - user << "-Weed level: [weedlevel] / 10" - user << "-Pest level: [pestlevel] / 10" - user << "-Toxicity level: [toxic] / 100" - user << "-Water level: [waterlevel] / [maxwater]" - user << "-Nutrition level: [nutrilevel] / [maxnutri]" + user << "-Weed level: [weedlevel] / 10" + user << "-Pest level: [pestlevel] / 10" + user << "-Toxicity level: [toxic] / 100" + user << "-Water level: [waterlevel] / [maxwater]" + user << "-Nutrition level: [nutrilevel] / [maxnutri]" user << "" else if(istype(O, /obj/item/weapon/cultivator)) @@ -863,9 +863,9 @@ podman.ckey = ckey_holder podman.gender = blood_gender podman.faction |= factions - if(!mutant_color) - mutant_color = "#59CE00" - hardset_dna(podman,null,null,podman.real_name,blood_type,/datum/species/plant/pod,mutant_color)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman + if(!features["mcolor"]) + features["mcolor"] = "#59CE00" + hardset_dna(podman,null,null,podman.real_name,blood_type,/datum/species/plant/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman podman.set_cloned_appearance() else //else, one packet of seeds. maybe two diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 05369322619..0e491e575bf 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -36,14 +36,14 @@ /obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "*** [plantname] ***" - user << "-Plant Endurance: [endurance]" - user << "-Plant Lifespan: [lifespan]" - user << "-Species Discovery Value: [rarity]" + user << "-Plant Endurance: [endurance]" + user << "-Plant Lifespan: [lifespan]" + user << "-Species Discovery Value: [rarity]" if(yield != -1) - user << "-Plant Yield: [yield]" - user << "-Plant Production: [production]" + user << "-Plant Yield: [yield]" + user << "-Plant Production: [production]" if(potency != -1) - user << "-Plant Potency: [potency]" + user << "-Plant Potency: [potency]" var/list/text_strings = get_analyzer_text() if(text_strings) for(var/string in text_strings) @@ -90,7 +90,7 @@ var/datum/mind/mind = null var/blood_gender = null var/blood_type = null - var/mutant_color = null + var/list/features = null var/factions = null var/contains_sample = 0 @@ -104,7 +104,7 @@ realName = bloodSample.data["real_name"] blood_gender = bloodSample.data["gender"] blood_type = bloodSample.data["blood_type"] - mutant_color = bloodSample.data["mutant_color"] + features = bloodSample.data["features"] factions = bloodSample.data["factions"] W.reagents.clear_reagents() user << "You inject the contents of the syringe into the seeds." @@ -1348,8 +1348,8 @@ return var/turf/T = get_turf(src) user << "You plant the kudzu. You monster." - message_admins("Kudzu planted by [key_name(user, user.client)](?) at ([T.x],[T.y],[T.z] - (JMP))",0,1) - investigate_log("was planted by [user.ckey]([user]) at ([T.x],[T.y],[T.z])","kudzu") + message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1) + investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu") new /obj/effect/spacevine_controller(user.loc, mutations, potency, production) qdel(src) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index b22c6d40087..298ebdcf61c 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -63,7 +63,8 @@ if(2) if(is_type_in_list(I, allowed_books)) - user.drop_item() + if(!user.drop_item()) + return I.loc = src update_icon() else if(istype(I, /obj/item/weapon/storage/bag/books)) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 254b383c7a4..f5dc638ee49 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -16,8 +16,9 @@ */ /obj/machinery/computer/libraryconsole name = "library visitor console" - icon = 'icons/obj/computer.dmi' - icon_state = "library" + icon_state = "oldcomp" + icon_screen = "library" + icon_keyboard = null circuit = /obj/item/weapon/circuitboard/libraryconsole var/screenstate = 0 var/title @@ -446,7 +447,8 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums /obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/book)) - user.drop_item() + if(!user.drop_item()) + return O.loc = src /obj/machinery/libraryscanner/attack_hand(var/mob/user as mob) @@ -504,7 +506,8 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums if(busy) user << "The book binder is busy. Please wait for completion of previous operation." return - user.drop_item() + if(!user.drop_item()) + return O.loc = src user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].") src.visible_message("[src] begins to hum as it warms up its printing drums.") diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 1dd002229be..265238f483c 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -89,7 +89,8 @@ if(istype(W,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I) && !istype(inserted_id)) - usr.drop_item() + if(!user.drop_item()) + return I.loc = src inserted_id = I interact(user) @@ -184,7 +185,8 @@ else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) - usr.drop_item() + if(!usr.drop_item()) + return I.loc = src inserted_id = I else usr << "No valid ID." @@ -333,7 +335,8 @@ else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) - usr.drop_item() + if(!usr.drop_item()) + return I.loc = src inserted_id = I else usr << "No valid ID." @@ -356,7 +359,8 @@ if(istype(I,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/C = usr.get_active_hand() if(istype(C) && !istype(inserted_id)) - usr.drop_item() + if(!usr.drop_item()) + return C.loc = src inserted_id = C interact(user) diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 7f0992a502f..079eaeab8dd 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -1,8 +1,6 @@ /obj/machinery/computer/shuttle/labor name = "labor shuttle console" desc = "Used to call and send the labor camp shuttle." - icon = 'icons/obj/computer.dmi' - icon_state = "shuttle" circuit = /obj/item/weapon/circuitboard/labor_shuttle shuttleId = "laborcamp" possible_destinations = "laborcamp_home;laborcamp_away" diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index e9dc6f7d14f..366ade4a6de 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -86,7 +86,8 @@ else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand() if(istype(I)) - usr.drop_item() + if(!usr.drop_item()) + return I.loc = src inserted_id = I else usr << "Invalid ID." diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index ddfdd96ad9a..00bed34c8fd 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -256,19 +256,16 @@ var/global/list/rockTurfEdgeCache var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - if(user) - activated_ckey = "[user.ckey]" - activated_name = "[user.name]" var/notify_admins = 0 if(z != 5) notify_admins = 1 if(!triggered_by_explosion) - message_admins("[src.activated_ckey]/([src.activated_name])? has triggered a gibtonite deposit reaction at [A.name] (JMP).") + message_admins("[key_name_admin(user)]? (FLW) has triggered a gibtonite deposit reaction at [A.name] (JMP).") else message_admins("An explosion has triggered a gibtonite deposit reaction at [A.name] (JMP).") if(!triggered_by_explosion) - log_game("[src.activated_ckey] ([src.activated_name]) has triggered a gibtonite deposit reaction at [A.name] ([A.x], [A.y], [A.z]).") + log_game("[key_name(user)] has triggered a gibtonite deposit reaction at [A.name] ([A.x], [A.y], [A.z]).") else log_game("An explosion has triggered a gibtonite deposit reaction at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 4f0e74aff4c..e9befa30d43 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -60,8 +60,9 @@ ..() if (istype(W, /obj/item/weapon/coin)) var/obj/item/weapon/coin/C = W + if(!user.drop_item()) + return user << "You add the [C.name] into the bag." - usr.drop_item() contents += C if (istype(W, /obj/item/weapon/moneybag)) var/obj/item/weapon/moneybag/C = W diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index bf394e7ac21..baddbc27a53 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -177,13 +177,13 @@ if(triggered_by == 1) message_admins("An explosion has triggered a [name] to detonate at [A.name] (JMP).") else if(triggered_by == 2) - message_admins("A signal has triggered a [name] to detonate at [A.name] (JMP). Igniter attacher: [attacher]") + message_admins("A signal has triggered a [name] to detonate at [A.name] (JMP). Igniter attacher: [key_name_admin(attacher)]? (FLW)") else - message_admins("[key_name(user)]? has triggered a [name] to detonate at [A.name] (JMP).") + message_admins("[key_name_admin(user)]? (FLW) has triggered a [name] to detonate at [A.name] (JMP).") if(triggered_by == 1) log_game("An explosion has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") else if(triggered_by == 2) - log_game("A signal has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z]). Igniter attacher: [attacher].") + log_game("A signal has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z]). Igniter attacher: [key_name(attacher)].") else user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.") log_game("[key_name(user)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 211cadcdf97..edb420703b4 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -11,7 +11,8 @@ /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/ore)) - user.drop_item() + if(!user.drop_item()) + return W.loc = src if (istype(W, /obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 57c3783ed82..cf4f18c5d07 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -100,7 +100,7 @@ src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, scratch,\nscretch, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper" else - src << " Unusable emote '[act]'. Say *help for a list." + src << "Unusable emote '[act]'. Say *help for a list." if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 469e4023946..093c727edc5 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -40,9 +40,9 @@ if(L.amount_grown >= L.max_grown) //TODO ~Carn L << "You are growing into a beautiful alien! It is time to choose a caste." L << "There are three to choose from:" - L << "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves." - L << "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters." - L << "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen." + L << "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves." + L << "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters." + L << "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen." var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone") var/mob/living/carbon/alien/humanoid/new_xeno diff --git a/code/modules/mob/living/carbon/alien/screen.dm b/code/modules/mob/living/carbon/alien/screen.dm index 731fc39b4f1..43a98198a02 100644 --- a/code/modules/mob/living/carbon/alien/screen.dm +++ b/code/modules/mob/living/carbon/alien/screen.dm @@ -4,7 +4,7 @@ /mob/living/carbon/alien/proc/updatePlasmaDisplay() if(hud_used) //clientless aliens - hud_used.alien_plasma_display.maptext = "
[round(storedPlasma)]
"
+ hud_used.alien_plasma_display.maptext = "[round(storedPlasma)]
"
/mob/living/carbon/alien/larva/updatePlasmaDisplay()
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 95838e1b90d..ffb73ef359f 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -41,6 +41,8 @@
user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!"
return
+ if(!user.unEquip(src))
+ return
var/mob/living/carbon/brain/B = newbrain.brainmob
if(!B.key)
var/mob/dead/observer/ghost = B.get_ghost()
@@ -58,7 +60,6 @@
dead_mob_list -= brainmob //Update dem lists
living_mob_list += brainmob
- user.drop_item()
newbrain.loc = src //P-put your brain in it
brain = newbrain
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bae07c42c8d..030b2a74750 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -251,7 +251,7 @@
if(istype(item, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = item
- item = G.throw() //throw the person instead of the grab
+ item = G.get_mob_if_throwable() //throw the person instead of the grab
qdel(G) //We delete the grab, as it needs to stay around until it's returned.
if(ismob(item))
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
@@ -306,7 +306,7 @@
Left Hand: [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Nothing"]
Right Hand: [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Nothing"]"} - dat += "
Back: [back ? back : "Nothing"]" + dat += "
Back: [back ? back : "Nothing"]" if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank)) dat += "
[internal ? "Disable Internals" : "Set Internals"]" @@ -402,7 +402,7 @@ var/const/GALOSHES_DONT_HELP = 8 return /mob/living/carbon/resist_buckle() - if(handcuffed) + if(restrained()) changeNext_move(CLICK_CD_BREAKOUT) last_special = world.time + CLICK_CD_BREAKOUT visible_message("[src] attempts to unbuckle themself!", \ diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 4026083e1ac..50a9c2c47fe 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -9,6 +9,9 @@ var/obj/item/handcuffed = null //Whether or not the mob is handcuffed var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this. + var/list/features = list("mcolor" = "FFF", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None") + + //inventory slots var/obj/item/back = null var/obj/item/clothing/mask/wear_mask = null diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index e8b46b5ca51..289fb8e5ee8 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -30,7 +30,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 /mob/living/carbon/human/proc/fixblood() for(var/datum/reagent/blood/B in vessel.reagent_list) if(B.id == "blood") - B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"mutant_color"=null, "factions"=null) + B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"features"=null, "factions"=null) /mob/living/carbon/human/proc/suppress_bloodloss(var/amount) if(bleedsuppress) @@ -172,7 +172,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 B.data["blood_type"] = copytext(src.dna.blood_type,1,0) B.data["gender"] = src.gender B.data["real_name"] = src.real_name - B.data["mutant_color"] = src.dna.mutant_color + B.data["features"] = src.dna.features B.data["factions"] = src.faction return B diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1fda3b351f4..9a718fb01bc 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -355,7 +355,9 @@ return if("tail" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "tail" + dna.species.mutant_bodyparts -= "spines" dna.species.mutant_bodyparts |= "waggingtail" + dna.species.mutant_bodyparts |= "waggingspines" update_body() @@ -364,5 +366,8 @@ return if("waggingtail" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "waggingtail" + dna.species.mutant_bodyparts -= "waggingspines" dna.species.mutant_bodyparts |= "tail" + dna.species.mutant_bodyparts |= "spines" + update_body() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b51e729b8d0..696c9a3b5a4 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -272,7 +272,7 @@ if(perpname) var/datum/data/record/R = find_record("name", perpname, data_core.general) if(R) - msg += "Rank: [R.fields["rank"]]
" + msg += "Rank: [R.fields["rank"]]
" msg += "\[Front photo\] " msg += "\[Side photo\]
" if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(CIH,/obj/item/cybernetic_implant/eyes/hud/medical)) @@ -300,8 +300,8 @@ if(R) criminal = R.fields["criminal"] - msg += "Criminal status: \[[criminal]\]\n" - msg += "Security record: \[View\] " + msg += "Criminal status: \[[criminal]\]\n" + msg += "Security record: \[View\] " msg += "\[Add crime\] " msg += "\[View comment log\] " msg += "\[Add comment\]\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 620d251ed54..16be6a0f49e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -166,7 +166,7 @@ /mob/living/carbon/human/blob_act() if(stat == DEAD) return - show_message(" The blob attacks you!") + show_message("The blob attacks you!") var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone)) apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "melee")) @@ -291,6 +291,8 @@ usr.put_in_hands(I) usr.emote("scream") usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()].") + if(!has_embedded_objects()) + clear_alert("embeddedobject") return if(href_list["item"]) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7d29d7a3bdc..c99b39e3995 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -79,7 +79,7 @@ if(2) say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!", "port ba[pick("y", "i", "e")] med!!!!", "REVIRT GON CHEM!!!!!!!!", "youed call her a toeugh bithc", "closd for merbegging", "pray can u [pick("spawn", "MAke me", "creat")] [pick("zenomorfs", "ayleins", "treaitors", "sheadow linkgs", "ubdoocters")]???")) if(3) - say(pick("GEY AWAY FROM ME U GREIFING PRICK!!!!", "ur a fuckeing autist!", ";HELP SHITECIRTY MURDERIN MEE!!!", "hwat dose tha [pick("g", "squid", "r")] mean?????", "CAL; TEH SHUTTLE!!!!!", "wearnig siNGUARLTY IS .... FIne xDDDDDDDDD", "AI laW 22 Open door", "this SI mY stATIon......", "who the HELL do u thenk u r?!!!!", "geT THE FUCK OUTTTT", "H U G B O X", ";;CRAGING THIS STTAYTION WITH NIO SURVIVROS", "[pick("bager", "syebl")] is down11!!!!!!!!!!!!!!!!!")) + say(pick("GEY AWAY FROM ME U GREIFING PRICK!!!!", "ur a fuckeing autist!", ";HELP SHITECIRTY MURDERIN MEE!!!", "hwat dose tha [pick("g", "squid", "r")] mean?????", "CAL; TEH SHUTTLE!!!!!", "wearnig siNGUARLTY IS .... FIne xDDDDDDDDD", "AI laW 22 Open door", "this SI mY stATIon......", "who the HELL do u thenk u r?!!!!", "geT THE FUCK OUTTTT", "H U G B O X", ";;CRAGING THIS STTAYTION WITH NIO SURVIVROS", "[pick("bager", "syebl")] is down11!!!!!!!!!!!!!!!!!", "PSHOOOM")) if(4) emote("drool") @@ -308,7 +308,7 @@ if(mind.changeling) mind.changeling.regenerate() hud_used.lingchemdisplay.invisibility = 0 - hud_used.lingchemdisplay.maptext = "
[round(mind.changeling.chem_charges)]
"
+ hud_used.lingchemdisplay.maptext = "[round(mind.changeling.chem_charges)]
"
else
hud_used.lingchemdisplay.invisibility = 101
@@ -335,6 +335,8 @@
L.embedded_objects -= I
I.loc = get_turf(src)
visible_message("\the [I] falls out of [name]'s [L.getDisplayName()]!","\the [I] falls out of your [L.getDisplayName()]!")
+ if(!has_embedded_objects())
+ clear_alert("embeddedobject")
/mob/living/carbon/human/handle_heart()
if(!heart_attack)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index caa356eb117..ae6d8824d95 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -113,7 +113,7 @@
spec_base = image("icon" = 'icons/mob/human.dmi', "icon_state" = icon_state_string, "layer" = -SPECIES_LAYER)
- spec_base.color = "#[H.dna.mutant_color]"
+ spec_base.color = "#[H.dna.features["mcolor"]]"
standing = spec_base
if(standing)
@@ -136,7 +136,7 @@
if(hair_color)
if(hair_color == "mutcolor")
- img_facial_s.color = "#" + H.dna.mutant_color
+ img_facial_s.color = "#" + H.dna.features["mcolor"]
else
img_facial_s.color = "#" + hair_color
else
@@ -164,7 +164,7 @@
if(hair_color)
if(hair_color == "mutcolor")
- img_hair_s.color = "#" + H.dna.mutant_color
+ img_hair_s.color = "#" + H.dna.features["mcolor"]
else
img_hair_s.color = "#" + hair_color
else
@@ -240,33 +240,75 @@
if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
bodyparts_to_add -= "tail"
+
if("waggingtail" in mutant_bodyparts)
if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
bodyparts_to_add -= "waggingtail"
else if ("tail" in mutant_bodyparts)
bodyparts_to_add -= "waggingtail"
+ if("spines" in mutant_bodyparts)
+ if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+ bodyparts_to_add -= "spines"
+
+ if("waggingspines" in mutant_bodyparts)
+ if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+ bodyparts_to_add -= "waggingspines"
+ else if ("tail" in mutant_bodyparts)
+ bodyparts_to_add -= "waggingspines"
+
if("snout" in mutant_bodyparts) //Take a closer look at that snout!
if(H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE))
bodyparts_to_add -= "snout"
+ if("frills" in mutant_bodyparts)
+ if(!H.dna.features["frills"] || H.dna.features["frills"] == "None" || H.head && (H.head.flags_inv & HIDEEARS))
+ bodyparts_to_add -= "frills"
+
+ if("horns" in mutant_bodyparts)
+ if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags & BLOCKHAIR) || (H.wear_mask && (H.wear_mask.flags & BLOCKHAIR)))
+ bodyparts_to_add -= "horns"
+
if(!bodyparts_to_add)
return
- var/icon_state_string = "[id]_"
var/g = (H.gender == FEMALE) ? "f" : "m"
- var/image/I
- if(sexes)
- icon_state_string += "[g]_s"
- else
- icon_state_string += "_s"
+ var/image/I
for(var/layer in relevent_layers)
for(var/bodypart in bodyparts_to_add)
- I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = "[icon_state_string]_[bodypart]_[layer]", "layer" =- layer)
+ var/datum/sprite_accessory/S
+ switch(bodypart)
+ if("tail")
+ S = tails_list[H.dna.features["tail"]]
+ if("waggingtail")
+ S.= animated_tails_list[H.dna.features["tail"]]
+ if("spines")
+ S = spines_list[H.dna.features["spines"]]
+ if("waggingspines")
+ S.= animated_spines_list[H.dna.features["spines"]]
+ if("snout")
+ S = snouts_list[H.dna.features["snout"]]
+ if("frills")
+ S = frills_list[H.dna.features["frills"]]
+ if("horns")
+ S = horns_list[H.dna.features["horns"]]
+ if("body_markings")
+ S = body_markings_list[H.dna.features["body_markings"]]
+
+ if(!S || S.icon_state == "none")
+ continue
+ var/icon_string
+ if(S.gender_specific)
+ icon_string = "[id]_[g]_[bodypart]_[S.icon_state]_[layer]"
+ else
+ icon_string = "[id]_m_[bodypart]_[S.icon_state]_[layer]"
+
+ I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = icon_string, "layer" =- layer)
+
if(!(H.disabilities & HUSK))
- I.color = "#[H.dna.mutant_color]"
+ I.color = "#[H.dna.features["mcolor"]]"
standing += I
H.overlays_standing[layer] = standing.Copy()
standing = list()
@@ -558,8 +600,12 @@
H.client.screen += global_hud.darkMask
if(H.blind)
- if(H.eye_blind) H.blind.layer = 18
- else H.blind.layer = 0
+ if(H.eye_blind)
+ H.throw_alert("blind")
+ H.blind.layer = 18
+ else
+ H.clear_alert("blind")
+ H.blind.layer = 0
if(!H.client)//no client, no screen to update
return 1
@@ -567,7 +613,11 @@
if( H.disabilities & NEARSIGHT && !istype(H.glasses, /obj/item/clothing/glasses/regular) )
H.client.screen += global_hud.vimpaired
if(H.eye_blurry) H.client.screen += global_hud.blurry
- if(H.druggy) H.client.screen += global_hud.druggy
+ if(H.druggy)
+ H.client.screen += global_hud.druggy
+ H.throw_alert("high")
+ else
+ H.clear_alert("high")
if(H.eye_stat > 20)
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index dd01e5a0420..79f84797b28 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -30,7 +30,7 @@
default_color = "00FF00"
roundstart = 1
specflags = list(MUTCOLORS,EYECOLOR,LIPS)
- mutant_bodyparts = list("tail", "snout")
+ mutant_bodyparts = list("tail", "snout", "spines", "horns", "frills", "body_markings")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 120e7da4350..9ac7837148a 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -293,12 +293,16 @@
CheckStamina()
if(sleeping)
+ throw_alert("asleep")
handle_dreams()
adjustStaminaLoss(-10)
sleeping = max(sleeping-1, 0)
if( prob(10) && health && !hal_crit )
spawn(0)
emote("snore")
+ else
+ clear_alert("asleep")
+
var/restingpwr = 1 + 4 * resting
@@ -371,10 +375,6 @@
else
hallucination -= 2
- else
- for(var/atom/a in hallucinations)
- qdel(a)
-
//this handles hud updates. Calls update_vision() and handle_hud_icons()
/mob/living/carbon/handle_regular_hud_updates()
if(!client) return 0
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 1005cf6f2fc..bec6d68d0ae 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -145,7 +145,7 @@
if(mind.changeling)
mind.changeling.regenerate()
hud_used.lingchemdisplay.invisibility = 0
- hud_used.lingchemdisplay.maptext = " [round(mind.changeling.chem_charges)]
"
+ hud_used.lingchemdisplay.maptext = "[round(mind.changeling.chem_charges)]
"
else
hud_used.lingchemdisplay.invisibility = 101
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index af02c55f543..5beeeb3a847 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -170,8 +170,10 @@
if(blind)
if(eye_blind)
blind.layer = 18
+ throw_alert("blind")
else
blind.layer = 0
+ clear_alert("blind")
if (disabilities & NEARSIGHT)
client.screen += global_hud.vimpaired
@@ -181,6 +183,9 @@
if (druggy)
client.screen += global_hud.druggy
+ throw_alert("high")
+ else
+ clear_alert("high")
if(eye_stat > 20)
if(eye_stat > 30)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 855ecf423c4..d23dcbabcc0 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -664,6 +664,10 @@ Sorry Giacom. Please don't be mad :(
/mob/living/update_gravity(has_gravity)
if(!ticker)
return
+ if(has_gravity)
+ clear_alert("weightless")
+ else
+ throw_alert("weightless")
float(!has_gravity)
/mob/living/proc/float(on)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 59436c1028b..6509db4ac67 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -17,8 +17,6 @@
var/hallucination = 0 //Directly affects how long a mob will hallucinate for
- var/list/atom/hallucinations = list() //A list of hallucinated people that try to attack the mob. See /obj/effect/fake_attacker in hallucinations.dm
-
var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out.
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index 48adee0e407..62edcd7bd03 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -114,7 +114,7 @@
var/turf/t = turf
if(obscuredTurfs[t])
if(!t.obscured)
- t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
+ t.obscured = image('icons/effects/cameravis.dmi', t, "black", 16)
obscured += t.obscured
for(var/eye in seenby)
@@ -169,7 +169,7 @@
for(var/turf in obscuredTurfs)
var/turf/t = turf
if(!t.obscured)
- t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
+ t.obscured = image('icons/effects/cameravis.dmi', t, "black", 16)
obscured += t.obscured
#undef UPDATE_BUFFER
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index aed6b5c06a4..d78b2448e28 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -6,30 +6,37 @@
make_laws()
/mob/living/silicon/proc/set_zeroth_law(var/law, var/law_borg)
+ throw_alert("newlaw")
src.laws_sanity_check()
src.laws.set_zeroth_law(law, law_borg)
/mob/living/silicon/proc/add_inherent_law(var/law)
+ throw_alert("newlaw")
laws_sanity_check()
laws.add_inherent_law(law)
/mob/living/silicon/proc/clear_inherent_laws()
+ throw_alert("newlaw")
laws_sanity_check()
laws.clear_inherent_laws()
/mob/living/silicon/proc/add_supplied_law(var/number, var/law)
+ throw_alert("newlaw")
laws_sanity_check()
laws.add_supplied_law(number, law)
/mob/living/silicon/proc/clear_supplied_laws()
+ throw_alert("newlaw")
laws_sanity_check()
laws.clear_supplied_laws()
/mob/living/silicon/proc/add_ion_law(var/law)
+ throw_alert("newlaw")
laws_sanity_check()
laws.add_ion_law(law)
/mob/living/silicon/proc/clear_ion_laws()
+ throw_alert("newlaw")
laws_sanity_check()
laws.clear_ion_laws()
@@ -40,3 +47,8 @@
if(2)
var/datum/ai_laws/lawtype = pick(typesof(/datum/ai_laws/default) - /datum/ai_laws/default)
laws = new lawtype()
+ laws.associate(src)
+
+/mob/living/silicon/proc/clear_zeroth_law(var/force)
+ laws_sanity_check()
+ laws.clear_zeroth_law(force)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 4144a3a3ef2..5655b34bc97 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -632,9 +632,9 @@
var/dat = "Digital Messenger
" dat += {"Signal/Receiver Status: - [(pda.toff) ? " \[Off\]" : " \[On\]"]+ [(pda.toff) ? "\[Off\]" : "\[On\]"]
Ringer Status: - [(pda.silent) ? " \[Off\]" : " \[On\]"]
"} + [(pda.silent) ? "\[Off\]" : "\[On\]"]
"} dat += "
- "
if(!pda.toff)
for (var/obj/item/device/pda/P in sortNames(get_viewable_pdas()))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index c016f818fbd..e37ac76c526 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -450,7 +450,8 @@
else if(cell)
user << "There is a power cell already installed!"
else
- user.drop_item()
+ if(!user.drop_item())
+ return
W.loc = src
cell = W
user << "You insert the power cell."
@@ -525,27 +526,29 @@
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
if(!opened)
- usr << "You must access the borgs internals!"
+ user << "You must access the borgs internals!"
else if(!src.module && U.require_module)
- usr << "The borg must choose a module before it can be upgraded!"
+ user << "The borg must choose a module before it can be upgraded!"
else if(U.locked)
- usr << "The upgrade is locked and cannot be used yet!"
+ user << "The upgrade is locked and cannot be used yet!"
else
+ if(!user.drop_item())
+ return
if(U.action(src))
- usr << "You apply the upgrade to [src]."
- usr.drop_item()
+ user << "You apply the upgrade to [src]."
U.loc = src
else
- usr << "Upgrade error."
+ user << "Upgrade error."
else if(istype(W, /obj/item/device/toner))
if(toner >= tonermax)
- usr << "The toner level of [src] is at it's highest level possible!"
+ user << "The toner level of [src] is at it's highest level possible!"
else
+ if(!user.drop_item())
+ return
toner = 40
- usr.drop_item()
qdel(W)
- usr << "You fill the toner level of [src] to its max capacity."
+ user << "You fill the toner level of [src] to its max capacity."
else
if(W.force && W.damtype != STAMINA) //only sparks if real damage is dealt.
@@ -577,6 +580,7 @@
log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
clear_supplied_laws()
clear_inherent_laws()
+ clear_zeroth_law(0)
laws = new /datum/ai_laws/syndicate_override
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
@@ -939,6 +943,10 @@
// They stay locked down if their wire is cut.
if(wires.LockedCut())
state = 1
+ if(state)
+ throw_alert("locked")
+ else
+ clear_alert("locked")
lockcharge = state
update_canmove()
@@ -953,6 +961,10 @@
if(hud_used)
hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open.
update_icons()
+ if(emagged)
+ throw_alert("hacked")
+ else
+ clear_alert("hacked")
/mob/living/silicon/robot/verb/outputlaws()
set category = "Robot Commands"
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index a04e155095f..c73a3443b09 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -68,7 +68,7 @@
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
user << "[src] is wearing too much armor! You can't cause \him any damage."
- visible_message(" [user] hits [src] with [O], however [src] is too armored.")
+ visible_message("[user] hits [src] with [O], however [src] is too armored.")
else
user << "[src] is wearing too much armor! You can't reach \his skin."
visible_message("[user] gently taps [src] with [O].")
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 3ee98de3c03..c835c1c4e79 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -112,4 +112,29 @@
/mob/living/simple_animal/drone/stripPanelEquip(obj/item/what, mob/who, where)
- ..(what, who, where, 1)
\ No newline at end of file
+ ..(what, who, where, 1)
+
+/mob/living/simple_animal/drone/verb/quick_equip()
+ set name = "quick-equip"
+ set hidden = 1
+ var/obj/item/I = get_active_hand()
+ var/obj/item/weapon/storage/S = get_inactive_hand()
+ var/obj/item/weapon/storage/T = internal_storage
+ if (!I)
+ usr << "You are not holding anything to equip!"
+ return
+ if(equip_to_appropriate_slot(I))
+ if(hand)
+ update_inv_l_hand(0)
+ else
+ update_inv_r_hand(0)
+ else if(s_active && s_active.can_be_inserted(I,1)) //if storage active insert there
+ s_active.handle_item_insertion(I)
+ else if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) //see if we have box in other hand
+ S.handle_item_insertion(I)
+ else if (istype(T) && T.can_be_inserted(I,1)) // If carrying storage item like toolbox
+ T.handle_item_insertion(I)
+ else if(!internal_storage)
+ equip_to_slot(I, "drone_storage_slot")
+ else
+ usr << "You are unable to equip that!"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index ab816782d26..1d3e90fb8e5 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -155,8 +155,8 @@
var/T = src.loc
- if(!stat)
- return 0
+ if(stat == DEAD)
+ return
if(busy != SPINNING_WEB)
busy = SPINNING_WEB
src.visible_message("\the [src] begins to secrete a sticky substance.")
@@ -173,8 +173,8 @@
set category = "Spider"
set desc = "Wrap up prey to feast upon and objects for safe keeping."
- if(!stat)
- return 0
+ if(stat == DEAD)
+ return
if(!cocoon_target)
var/list/choices = list()
for(var/mob/living/L in view(1,src))
@@ -232,8 +232,8 @@
set desc = "Lay a clutch of eggs, but you must wrap a creature for feeding first."
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
- if(!stat)
- return 0
+ if(stat == DEAD)
+ return
if(E)
src << "There is already a cluster of eggs here!"
else if(!fed)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 4c2abe52a30..f7f81ef7c41 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -346,16 +346,16 @@
MED.amount -= 1
if(MED.amount <= 0)
qdel(MED)
- visible_message(" [user] applies [MED] on [src].")
+ visible_message("[user] applies [MED] on [src].")
return
else
- user << " [MED] won't help at all."
+ user << "[MED] won't help at all."
return
else
- user << " [src] is at full health."
+ user << "[src] is at full health."
return
else
- user << " [src] is dead, medical items won't bring it back to life."
+ user << "[src] is dead, medical items won't bring it back to life."
return
if((butcher_results) && (stat == DEAD))
@@ -494,11 +494,11 @@
/mob/living/simple_animal/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
-
+
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
resize = RESIZE_DEFAULT_SIZE
-
+
if(changed)
- animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
new file mode 100644
index 00000000000..267af8c2dd7
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
@@ -0,0 +1,173 @@
+//////////////////The Monster
+
+/mob/living/simple_animal/slaughter
+ name = "Slaughter Demon"
+ real_name = "Slaughter Demon"
+ desc = "You should run."
+ speak_emote = list("gurgles")
+ emote_hear = list("wails","screeches")
+ response_help = "thinks better of touching"
+ response_disarm = "flails at"
+ response_harm = "punches"
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "daemon"
+ speed = 0
+ a_intent = "harm"
+ stop_automated_movement = 1
+ status_flags = CANPUSH
+ attack_sound = 'sound/magic/demon_attack1.ogg'
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ faction = list("slaughter")
+ attacktext = "wildly tears into"
+ maxHealth = 250
+ health = 250
+ environment_smash = 1
+ melee_damage_lower = 30
+ melee_damage_upper = 30
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_MINIMUM
+ var/devoured = 0
+ var/phased = FALSE
+ var/holder = null
+ var/eating = FALSE
+ var/mob/living/kidnapped = null
+ var/playstyle_string = "You are the Slaughter Demon, a terible creature from another existence. You have a single desire: To kill. \
+ You may Ctrl+Click on blood pools to travel through them, appearing and dissaapearing from the station at will. \
+ Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. "
+
+
+/mob/living/simple_animal/slaughter/death()
+ ..(1)
+ new /obj/effect/decal/cleanable/blood (src.loc)
+ new /obj/item/weapon/demonheart (src.loc)
+ playsound(get_turf(src),'sound/magic/demon_dies.ogg', 200, 1)
+ visible_message("The [src] screams in anger as its form collapes into a pool of viscera.")
+ ghostize()
+ qdel(src)
+ return
+
+
+
+////////////////////The Powers
+
+/mob/living/simple_animal/slaughter/proc/phaseout(var/obj/effect/decal/cleanable/B)
+ var/turf/mobloc = get_turf(src.loc)
+ var/turf/bloodloc = get_turf(B.loc)
+ if(Adjacent(bloodloc))
+ src.notransform = TRUE
+ spawn(0)
+ src.visible_message("The [src] sinks into the pool of blood.")
+ playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
+ var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter( mobloc )
+ src.ExtinguishMob()
+ if(src.buckled)
+ src.buckled.unbuckle_mob()
+ if(src.pulling)
+ if(istype(src.pulling, /mob/living))
+ var/mob/living/victim = src.pulling
+ if(victim.stat == CONSCIOUS)
+ src.visible_message("[victim] kicks free of the [src] at the last second!")
+ else
+ victim.loc = holder
+ src.visible_message("The [src] drags [victim] into the pool of blood!")
+ src.kidnapped = victim
+ src.loc = holder
+ src.phased = TRUE
+ src.holder = holder
+ if(src.kidnapped)
+ src << "You being to feast on [kidnapped]. You can not move while you are doing this."
+ src.eating = TRUE
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ src << "You devour [kidnapped]. Your health is fully restored."
+ src.adjustBruteLoss(-1000)
+ kidnapped.ghostize()
+ qdel(kidnapped)
+ src.devoured++
+ src.kidnapped = null
+ src.eating = FALSE
+ src.notransform = 0
+
+/mob/living/simple_animal/slaughter/proc/phasein(var/obj/effect/decal/cleanable/B)
+ if(src.eating)
+ src << "Finish eating first!"
+ else
+ src.loc = B.loc
+ src.phased = FALSE
+ src.client.eye = src
+ src.visible_message("The [src] rises out of the pool of blood!")
+ playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
+ qdel(src.holder)
+
+/obj/effect/decal/cleanable/blood/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ if(S.phased)
+ S.phasein(src)
+ else
+ S.phaseout(src)
+
+
+/obj/effect/decal/cleanable/trail_holder/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ if(S.phased)
+ S.phasein(src)
+ else
+ S.phaseout(src)
+
+
+
+/turf/CtrlClick(var/mob/user)
+ ..()
+ if(istype(user, /mob/living/simple_animal/slaughter))
+ var/mob/living/simple_animal/slaughter/S = user
+ for(var/obj/effect/decal/cleanable/B in src.contents)
+ if(istype(B, /obj/effect/decal/cleanable/blood) || istype(B, /obj/effect/decal/cleanable/trail_holder))
+ if(S.phased)
+ S.phasein(B)
+ break
+ else
+ S.phaseout(B)
+ break
+
+/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow
+ name = "water"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "nothing"
+ var/canmove = 1
+ density = 0
+ anchored = 1
+
+obj/effect/dummy/slaughter/relaymove(var/mob/user, direction)
+ if (!src.canmove || !direction) return
+ var/turf/newLoc = get_step(src,direction)
+ loc = newLoc
+ src.canmove = 0
+ spawn(1)
+ src.canmove = 1
+
+/obj/effect/dummy/slaughter/ex_act(blah)
+ return
+/obj/effect/dummy/slaughter/bullet_act(blah)
+ return
+
+/obj/effect/dummy/slaughter/singularity_act(blah)
+ return
+
+
+//////////The Loot
+
+/obj/item/weapon/demonheart
+ name = "demon's heart"
+ desc = "It's still faintly beating with rage"
+ icon = 'icons/obj/surgery.dmi'
+ icon_state = "heart-on"
+ origin_tech = "combat=5;biotech=8"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
new file mode 100644
index 00000000000..3db4b52bcfd
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
@@ -0,0 +1,67 @@
+
+/datum/round_event_control/slaughter
+ name = "Spawn Slaughter Demon"
+ typepath = /datum/round_event/slaughter
+ weight = 0 //Admin only
+ max_occurrences = 1
+ earliest_start = 30 //Spawn later with more blood, hopefully
+
+
+
+/datum/round_event/slaughter
+ var/key_of_slaughter
+
+
+/datum/round_event/slaughter/proc/get_slaughter(var/end_if_fail = 0)
+ key_of_slaughter = null
+ if(!key_of_slaughter)
+ var/list/candidates = get_candidates(BE_ALIEN)
+ if(!candidates.len)
+ if(end_if_fail)
+ return 0
+ return find_slaughter()
+ var/client/C = pick(candidates)
+ key_of_slaughter = C.key
+ if(!key_of_slaughter)
+ if(end_if_fail)
+ return 0
+ return find_slaughter()
+ var/datum/mind/player_mind = new /datum/mind(key_of_slaughter)
+ player_mind.active = 1
+ var/list/spawn_locs = list()
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(isturf(L.loc))
+ switch(L.name)
+ if("carpspawn")
+ spawn_locs += L.loc
+ if(!spawn_locs)
+ return find_slaughter()
+ var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
+ var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
+ S.phased = TRUE
+ player_mind.transfer_to(S)
+ player_mind.assigned_role = "Slaughter Demon"
+ player_mind.special_role = "Slaughter Demon"
+ ticker.mode.traitors |= player_mind
+ S << S.playstyle_string
+ S << "You are currently not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest."
+ message_admins("[key_of_slaughter] has been made into a Slaughter Demon by an event.")
+ log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.")
+ return 1
+
+
+
+/datum/round_event/slaughter/start()
+ get_slaughter()
+
+
+
+/datum/round_event/slaughter/proc/find_slaughter()
+ message_admins("Attempted to spawn a Slaughter Demon but there was no players available. Will try again momentarily.")
+ spawn(50)
+ if(get_slaughter(1))
+ message_admins("Situation has been resolved, [key_of_slaughter] has been spawned as a Slaughter Demon.")
+ log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.")
+ return 0
+ message_admins("Unfortunately, no candidates were available for becoming a Slaugter Demon. Shutting down.")
+ return kill()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index e3a8d4fcdef..d638788ed1d 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -235,7 +235,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
else
- visible_message(" [M] manages to wrestle \the [name] off!")
+ visible_message("[M] manages to wrestle \the [name] off!")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
discipline_slime(M)
@@ -247,7 +247,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
else
- visible_message(" [M] manages to wrestle \the [name] off of [Victim]!")
+ visible_message("[M] manages to wrestle \the [name] off of [Victim]!")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
discipline_slime(M)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 233fcd4f485..45f84087221 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -47,7 +47,7 @@
..()
//Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
-/obj/item/weapon/grab/proc/throw()
+/obj/item/weapon/grab/proc/get_mob_if_throwable()
if(affecting)
if(affecting.buckled)
return null
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 8fd5ba2d93f..08b9a8939b2 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -149,7 +149,7 @@
else
output += "[O.optiontext]
- Added new photo-over-pda function. Apply the photo to PDA to send it with your next message! +
- Department Management consoles have been added to Head of Staff offices. These will enable heads to modify ID's access to their department, as well as preform demotions. +
- Bullets can now damage cameras. +
- Camera alarms now trigger 90 seconds after the first EMP pulse, instead of when all EMP pulses run out. +
- Makes the force required to damage cameras greater than or equal to ten instead of greater than ten. +
- Camera alarms now trigger when cameras are disabled with brute force or bullets. +
- Nanotrasen scientists have determined that a delaminating supermatter shard combining with a gravitational singularity is an extremely bad idea. They advise keeping the two as far apart as possible. +
- Nerfed the xray gun. Its range is now 15 tiles. +
- Lizards can now choose from a wide varity of physical appearances in character creation! Sprites made by WJohn. Hiss Responsibly. +
- A terrible new creature stalks the halls of SS13. +
- The wizard has a new artefact related to said creature. +
- Added a new sepia slime plasma reaction. Try it out! +
- Drones can now properly quick-equip. +
- White suits added to gang outfits +
- Gang outfits are now free, but are now limited in stock (that replenishes over time) +
- While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control. +
- Spraycan cost reduced to 5 influence. +
- Recruitment Pen cooldown increased to 2 minutes, but is reduced if the enemy gang has more members than yours. +
- Tommy guns no longer deal stamina damage. +
- Gangtools can no longer recall the shuttle if the game mode is not Gang War +
" else - output += " [O.optiontext]
" + output += "[O.optiontext]
" output += "" if(!voted) //Only make this a form if we have not voted yet @@ -324,7 +324,7 @@ else output += "[O.optiontext]
" else - output += " [O.optiontext]
" + output += "[O.optiontext]
" output += "" if(!voted) //Only make this a form if we have not voted yet diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 5415474439d..e28dcc3adab 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -14,8 +14,10 @@ hair_color = random_short_color() facial_hair_color = hair_color eye_color = random_eye_color() - pref_species = new /datum/species/human() + if(!pref_species) + pref_species = new /datum/species/human() backbag = 2 + features = random_features() age = rand(AGE_MIN,AGE_MAX) /datum/preferences/proc/update_preview_icon() //seriously. This is horrendous. @@ -45,24 +47,9 @@ preview_icon = new /icon('icons/mob/human.dmi', "[skin_tone]_[g]_s") else preview_icon = new /icon('icons/mob/human.dmi', "[pref_species.id]_[g]_s") - preview_icon.Blend("#[mutant_color]", ICON_MULTIPLY) + preview_icon.Blend("#[features["mcolor"]]", ICON_MULTIPLY) var/datum/sprite_accessory/S - if(underwear) - S = underwear_list[underwear] - if(S) - preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) - - if(undershirt) - S = undershirt_list[undershirt] - if(S) - preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) - - if(socks) - S = socks_list[socks] - if(S) - preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) - var/icon/eyes_s = new/icon() if(EYECOLOR in pref_species.specflags) eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[pref_species.eyes]_s") @@ -90,10 +77,47 @@ for(var/layer in relevent_layers) for(var/bodypart in pref_species.mutant_bodyparts) - var/icon/part = new/icon("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = "[icon_state_string]_[bodypart]_[layer]") - part.Blend("#[mutant_color]", ICON_MULTIPLY) + switch(bodypart) + if("tail") + S = tails_list[features["tail"]] + if("spines") + S = spines_list[features["spines"]] + if("snout") + S = snouts_list[features["snout"]] + if("frills") + S = frills_list[features["frills"]] + if("horns") + S = horns_list[features["horns"]] + if("body_markings") + S = body_markings_list[features["body_markings"]] + + if(!S || S.icon_state == "none") + continue + var/icon_string + if(S.gender_specific) + icon_string = "[pref_species.id]_[g]_[bodypart]_[S.icon_state]_[layer]" + else + icon_string = "[pref_species.id]_m_[bodypart]_[S.icon_state]_[layer]" + var/icon/part = new/icon("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = icon_string) + + part.Blend("#[features["mcolor"]]", ICON_MULTIPLY) preview_icon.Blend(part, ICON_OVERLAY) + if(underwear) + S = underwear_list[underwear] + if(S) + preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) + + if(undershirt) + S = undershirt_list[undershirt] + if(S) + preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) + + if(socks) + S = socks_list[socks] + if(S) + preview_icon.Blend(new /icon(S.icon, "[S.icon_state]_s"), ICON_OVERLAY) + var/icon/clothes_s = null if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high' clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s") diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 8b42ef1bcb8..c28d4fd705c 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -41,6 +41,7 @@ var/icon_state //the icon_state of the accessory var/name //the preview name of the accessory var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations + var/gender_specific //Something that can be worn by either gender, but looks different on each ////////////////////// // Hair Definitions // @@ -1046,3 +1047,232 @@ name = "Pantyhose" icon_state = "pantyhose" gender = FEMALE + +//////////.////////////////// +// MutantParts Definitions // +///////////////////////////// + +/datum/sprite_accessory/body_markings + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/body_markings/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/body_markings/dstripe + name = "Dark Stripe" + icon_state = "dstripe" + +/datum/sprite_accessory/body_markings/lstripe + name = "Light Stripe" + icon_state = "lstripe" + +/datum/sprite_accessory/body_markings/dtiger + name = "Dark Tiger Body" + icon_state = "dtiger" + +/datum/sprite_accessory/body_markings/dtigerhead + name = "Dark Tiger Body + Head" + icon_state = "dtigerhead" + +/datum/sprite_accessory/body_markings/ltiger + name = "Light Tiger Body" + icon_state = "ltiger" + +/datum/sprite_accessory/body_markings/ltigerhead + name = "Light Tiger Body + Head" + icon_state = "ltigerhead" + +/datum/sprite_accessory/body_markings/lbelly + name = "Light Belly" + icon_state = "lbelly" + gender_specific = 1 + +/datum/sprite_accessory/tails + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/tails/smooth + name = "Smooth" + icon_state = "smooth" + +/datum/sprite_accessory/tails_animated/smooth + name = "Smooth" + icon_state = "smooth" + +/datum/sprite_accessory/tails/light + name = "Light" + icon_state = "light" + +/datum/sprite_accessory/tails_animated/light + name = "Light" + icon_state = "light" + +/datum/sprite_accessory/tails/dstripe + name = "Dark Stripe" + icon_state = "dstripe" + +/datum/sprite_accessory/tails_animated/dstripe + name = "Dark Stripe" + icon_state = "dstripe" + +/datum/sprite_accessory/tails/lstripe + name = "Light Stripe" + icon_state = "lstripe" + +/datum/sprite_accessory/tails_animated/lstripe + name = "Light Stripe" + icon_state = "lstripe" + +/datum/sprite_accessory/tails/dtiger + name = "Dark Tiger" + icon_state = "dtiger" + +/datum/sprite_accessory/tails_animated/dtiger + name = "Dark Tiger" + icon_state = "dtiger" + +/datum/sprite_accessory/tails/ltiger + name = "Light Tiger" + icon_state = "ltiger" + +/datum/sprite_accessory/tails_animated/ltiger + name = "Light Tiger" + icon_state = "ltiger" + +/datum/sprite_accessory/tails/club + name = "Club" + icon_state = "club" + +/datum/sprite_accessory/tails_animated/club + name = "Club" + icon_state = "club" + +/datum/sprite_accessory/tails/aqua + name = "Aquatic" + icon_state = "aqua" + +/datum/sprite_accessory/tails_animated/aqua + name = "Aquatic" + icon_state = "aqua" + +/datum/sprite_accessory/snouts + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/snouts/sharp + name = "Sharp" + icon_state = "sharp" + +/datum/sprite_accessory/snouts/round + name = "Round" + icon_state = "round" + +/datum/sprite_accessory/snouts/sharplight + name = "Sharp + Light" + icon_state = "sharplight" + +/datum/sprite_accessory/snouts/roundlight + name = "Round + Light" + icon_state = "roundlight" + +/datum/sprite_accessory/horns + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/horns/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/horns/simple + name = "Simple" + icon_state = "simple" + +/datum/sprite_accessory/horns/short + name = "Short" + icon_state = "short" + +/datum/sprite_accessory/horns/curled + name = "Curled" + icon_state = "curled" + +/datum/sprite_accessory/horns/ram + name = "Ram" + icon_state = "ram" + +/datum/sprite_accessory/horns/angler + name = "Angeler" + icon_state = "angler" + +/datum/sprite_accessory/frills + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/frills/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/frills/simple + name = "Simple" + icon_state = "simple" + +/datum/sprite_accessory/frills/short + name = "Short" + icon_state = "short" + +/datum/sprite_accessory/frills/aquatic + name = "Aquatic" + icon_state = "aqua" + +/datum/sprite_accessory/spines + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/spines_animated + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/spines/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/spines_animated/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/spines/short + name = "Short" + icon_state = "short" + +/datum/sprite_accessory/spines_animated/short + name = "Short" + icon_state = "short" + +/datum/sprite_accessory/spines/shortmeme + name = "Short + Membrane" + icon_state = "shortmeme" + +/datum/sprite_accessory/spines_animated/shortmeme + name = "Short + Membrane" + icon_state = "shortmeme" + +/datum/sprite_accessory/spines/long + name = "Long" + icon_state = "long" + +/datum/sprite_accessory/spines_animated/long + name = "Long" + icon_state = "long" + +/datum/sprite_accessory/spines/longmeme + name = "Long + Membrane" + icon_state = "longmeme" + +/datum/sprite_accessory/spines_animated/longmeme + name = "Long + Membrane" + icon_state = "longmeme" + +/datum/sprite_accessory/spines/aqautic + name = "Aquatic" + icon_state = "aqua" + +/datum/sprite_accessory/spines_animated/aqautic + name = "Aquatic" + icon_state = "aqua" diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 6b67a64ac3f..5bebfcb8682 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -261,7 +261,7 @@ nanoui is used to open and update nano browser uis head_content += " " for (var/filename in stylesheets) - head_content += " " + head_content += "" var/templatel_data[0] for (var/key in templates) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index f664c87a8b9..9b2fb90596d 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -124,7 +124,6 @@ It is possible to destroy the net by the occupant or someone else. /obj/effect/energy_net/hitby(AM as mob|obj) ..() - visible_message("[src] was hit by [AM].") var/tforce = 0 if(ismob(AM)) tforce = 10 diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index ef1e10ba35e..621ee154caa 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -40,7 +40,7 @@ break lock_suit(U,1)//Check for icons. U.regenerate_icons() - U << " Linking neural-net interface...\nPattern\green GREEN, continuing operation." + U << "Linking neural-net interface...\nPattern\green GREEN, continuing operation." if(4) U << "VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE." if(5) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index ac8e32ecf63..8ae11c8f83c 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -28,7 +28,8 @@ /obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/paper)) - user.drop_item() + if(!user.unEquip(W)) + return W.loc = src toppaper = W user << "You clip the paper onto \the [src]." @@ -76,7 +77,8 @@ if(!haspen) if(istype(usr.get_active_hand(), /obj/item/weapon/pen)) var/obj/item/weapon/pen/W = usr.get_active_hand() - usr.drop_item() + if(!usr.unEquip(W)) + return W.loc = src haspen = W usr << "You slot [W] into [src]." diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 351443ec5bb..4d071708fb3 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -43,8 +43,9 @@ /obj/structure/filingcabinet/attackby(obj/item/P, mob/user, params) if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/documents)) + if(!user.drop_item()) + return user << "You put [P] in [src]." - user.drop_item() P.loc = src icon_state = "[initial(icon_state)]-open" sleep(5) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index b75140b9c43..6f725e04187 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -31,7 +31,8 @@ /obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents)) - user.drop_item() + if(!user.unEquip(W)) + return W.loc = src user << "You put [W] into [src]." update_icon() diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 96c8f83e2b0..bd947c4b7a3 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -55,8 +55,9 @@ /obj/item/weapon/hand_labeler/attackby(obj/item/I as obj, mob/user as mob, params) ..() if(istype(I, /obj/item/hand_labeler_refill)) + if(!user.unEquip(I)) + return user << "You insert [I] into [src]." - user.drop_item() qdel(I) labels_left = initial(labels_left) return diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index fbad5ce1f85..dd672a6d11c 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -71,7 +71,8 @@ if(!istype(i)) return ..() - user.drop_item() + if(!user.unEquip(i)) + return i.loc = src user << "You put [i] in [src]." papers.Add(i) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 341155a3721..d5efcbe8dd4 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -24,6 +24,9 @@ pressure_resistance = 2 var/colour = "black" //what colour the ink is! +/obj/item/weapon/pen/suicide_act(mob/user) + user.visible_message("[user] is scribbling numbers all over themself with [src]! It looks like they're trying to commit sudoku!") + return(BRUTELOSS) /obj/item/weapon/pen/blue desc = "It's a normal blue ink pen." @@ -93,26 +96,30 @@ if(M.client) M.mind_initialize() //give them a mind datum if they don't have one. if(user.mind in ticker.mode.A_bosses) - if(ticker.mode.add_gangster(M.mind,"A")) - M.Paralyse(5) - cooldown(ticker.mode.A_gang.len, ) - else - user << "This mind is resistant to recruitment!" + var/recruitable = ticker.mode.add_gangster(M.mind,"A") + switch(recruitable) + if(2) + M.Paralyse(5) + cooldown(max(0,ticker.mode.B_gang.len - ticker.mode.A_gang.len)) + if(1) + user << "This mind has already been recruited by another gang!" + else + user << "This mind is resistant to recruitment!" else if(user.mind in ticker.mode.B_bosses) - if(ticker.mode.add_gangster(M.mind,"B")) - M.Paralyse(5) - cooldown(ticker.mode.B_gang.len) - else - user << "This mind is resistant to recruitment!" - else - user << "This mind is so vacant that it is not susceptible to influence!" + var/recruitable = ticker.mode.add_gangster(M.mind,"B") + switch(recruitable) + if(2) + M.Paralyse(5) + cooldown(max(0,ticker.mode.A_gang.len - ticker.mode.B_gang.len)) + if(1) + user << "This mind has already been recruited by another gang!" + else + user << "This mind is resistant to recruitment!" /obj/item/weapon/pen/gang/proc/cooldown(modifier) - if(!modifier) - return cooldown = 1 icon_state = "pen_blink" - spawn(600) + spawn(max(50,1200-(modifier*100))) cooldown = 0 icon_state = "pen" var/mob/M = get(src, /mob) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 92f82705db9..35e87edada7 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -223,7 +223,8 @@ /obj/machinery/photocopier/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/paper)) if(copier_empty()) - user.drop_item() + if(!user.drop_item()) + return copy = O O.loc = src user << "You insert [O] into [src]." @@ -234,7 +235,8 @@ else if(istype(O, /obj/item/weapon/photo)) if(copier_empty()) - user.drop_item() + if(!user.drop_item()) + return photocopy = O O.loc = src user << "You insert [O] into [src]." @@ -245,7 +247,8 @@ else if(istype(O, /obj/item/device/toner)) if(toner <= 0) - user.drop_item() + if(!user.drop_item()) + return qdel(O) toner = 40 user << "You insert [O] into [src]." diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 378ec945f85..0832ab226f3 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -140,8 +140,9 @@ if(pictures_left) user << "[src] still has some film in it!" return + if(!user.unEquip(I)) + return user << "You insert [I] into [src]." - user.drop_item() qdel(I) pictures_left = pictures_max return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index de17516ede9..c57cd9b9875 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -413,7 +413,8 @@ if (stat & MAINT) user << "There is no connector for your power cell!" return - user.drop_item() + if(!user.drop_item()) + return W.loc = src cell = W user.visible_message(\ @@ -580,14 +581,10 @@ user << "Nothing happens!" else flick("apc-spark", src) - if (do_after(user,6)) - if(prob(50)) - emagged = 1 - locked = 0 - user << "You emag the APC interface." - update_icon() - else - user << "You fail to [ locked ? "unlock" : "lock"] the APC interface!" + emagged = 1 + locked = 0 + user << "You emag the APC interface." + update_icon() // attack with hand - remove cell (if cover open) or interact with the APC @@ -1251,4 +1248,4 @@ /obj/item/weapon/module/power_control name = "power control module" icon_state = "power_mod" - desc = "Heavy-duty switching circuits for power control." \ No newline at end of file + desc = "Heavy-duty switching circuits for power control." diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 00eb9f8c827..3608dde2b80 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -347,6 +347,8 @@ src.add_fingerprint(user) var/obj/item/weapon/light/L = W if(istype(L, light_type)) + if(!user.drop_item()) + return status = L.status user << "You insert the [L.name]." switchcount = L.switchcount @@ -355,7 +357,6 @@ on = has_power() update() - user.drop_item() //drop the item to update overlays and such qdel(L) if(on && rigged) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 3202414ffb7..82c2955ad09 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -64,7 +64,8 @@ var/global/list/rad_collectors = list() if(src.P) user << "There's already a plasma tank loaded!" return 1 - user.drop_item() + if(!user.drop_item()) + return 1 src.P = W W.loc = src update_icons() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 92d7b8105c1..1ab4c078d11 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -89,15 +89,15 @@ if(src.active==1) src.active = 0 user << "You turn off \the [src]." - message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) - log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])") - investigate_log("turned off by [user.key]","singulo") + message_admins("Emitter turned off by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) + log_game("Emitter turned off by [key_name(user)] in ([x],[y],[z])") + investigate_log("turned off by [key_name(user)]","singulo") else src.active = 1 user << "You turn on \the [src]." src.shot_number = 0 src.fire_delay = maximum_fire_delay - investigate_log("turned on by [user.key]","singulo") + investigate_log("turned on by [key_name(user)]","singulo") update_icon() else user << "The controls are locked!" diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index da304074573..c5fe52da089 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -119,9 +119,9 @@ if(strength > strength_upper_limit) strength = strength_upper_limit else - message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) - log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") - investigate_log("increased to [strength] by [usr.key]","singulo") + message_admins("PA Control Computer increased to [strength] by [key_name_admin(usr)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) + log_game("PA Control Computer increased to [strength] by [key_name(usr)] in ([x],[y],[z])") + investigate_log("increased to [strength] by [key_name(usr)]","singulo") strength_change() /obj/machinery/particle_accelerator/control_box/proc/remove_strength(var/s) @@ -130,9 +130,9 @@ if(strength < 0) strength = 0 else - message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) - log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") - investigate_log("decreased to [strength] by [usr.key]","singulo") + message_admins("PA Control Computer decreased to [strength] by [key_name_admin(usr)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) + log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in ([x],[y],[z])") + investigate_log("decreased to [strength] by [key_name(usr)]","singulo") strength_change() /obj/machinery/particle_accelerator/control_box/power_change() @@ -210,9 +210,9 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power() src.active = !src.active - investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo") - message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name(usr, usr.client) : "outside forces"](?) in ([x],[y],[z] - JMP)",0,1) - log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[usr.ckey]([usr])" : "outside forces"] in ([x],[y],[z])") + investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"]","singulo") + message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](?) (FLW) in ([x],[y],[z] - JMP)",0,1) + log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])") if(src.active) src.use_power = 2 for(var/obj/structure/particle_accelerator/part in connected_parts) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 85d8089d926..9a30df83891 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -25,6 +25,7 @@ var/target = null //its target. moves towards the target if it has one var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing var/last_warning + var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six allow_spin = 0 /obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0) //CARN: admin-alert for chuckle-fuckery. @@ -129,6 +130,8 @@ var/temp_allowed_size = src.allowed_size if(force_size) temp_allowed_size = force_size + if(temp_allowed_size >= STAGE_SIX && !consumedSupermatter) + temp_allowed_size = STAGE_FIVE switch(temp_allowed_size) if(STAGE_ONE) current_size = STAGE_ONE @@ -185,6 +188,15 @@ grav_pull = 10 consume_range = 4 dissipate = 0 //It cant go smaller due to e loss + if(STAGE_SIX) //This only happens if a stage 5 singulo consumes a supermatter shard. + current_size = STAGE_SIX + icon = 'icons/effects/352x352.dmi' + icon_state = "singularity_s11" + pixel_x = -160 + pixel_y = -160 + grav_pull = 15 + consume_range = 5 + dissipate = 0 if(current_size == allowed_size) investigate_log("grew to size [current_size]","singulo") return 1 @@ -199,6 +211,8 @@ investigate_log("collapsed.","singulo") qdel(src) return 0 + if(energy > 2999 && !consumedSupermatter) + energy = 2000 switch(energy)//Some of these numbers might need to be changed up later -Mport if(1 to 199) allowed_size = STAGE_ONE @@ -208,8 +222,10 @@ allowed_size = STAGE_THREE if(1000 to 1999) allowed_size = STAGE_FOUR - if(2000 to INFINITY) + if(2000 to 2999) allowed_size = STAGE_FIVE + if(3000 to INFINITY) + allowed_size = STAGE_SIX if(current_size != allowed_size) expand() return 1 @@ -230,6 +246,11 @@ /obj/singularity/proc/consume(var/atom/A) var/gain = A.singularity_act(current_size) src.energy += gain + if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter) + desc = "[initial(desc)] It glows fiercely with inner fire." + name = "supermatter-charged [initial(name)]" + consumedSupermatter = 1 + luminosity = 10 return @@ -326,6 +347,10 @@ toxmob() if(4)//Stun mobs who lack optic scanners mezzer() + if(5,6) //Sets all nearby mobs on fire + if(current_size < STAGE_SIX) + return 0 + combust_mobs() else return 0 return 1 @@ -347,6 +372,15 @@ return +/obj/singularity/proc/combust_mobs() + for(var/mob/living/carbon/C in orange(20, src)) + C.visible_message("[C]'s skin bursts into flame!", \ + "You feel an inner fire as your skin is suddenly covered in fire!") + C.adjust_fire_stacks(5) + C.IgniteMob() + return + + /obj/singularity/proc/mezzer() for(var/mob/living/carbon/M in oviewers(8, src)) if(istype(M, /mob/living/carbon/brain)) //Ignore brains diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 77c4aa75751..38bf1d6c869 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -253,8 +253,9 @@ if(!tracker) if(istype(W, /obj/item/weapon/tracker_electronics)) + if(!user.drop_item()) + return tracker = 1 - user.drop_item() qdel(W) user.visible_message("[user] inserts the electronics into the solar assembly.", "You insert the electronics into the solar assembly.") return 1 @@ -274,11 +275,13 @@ name = "solar panel control" desc = "A controller for solar panel arrays." icon = 'icons/obj/computer.dmi' - icon_state = "solar" + icon_state = "computer" anchored = 1 density = 1 use_power = 1 idle_power_usage = 250 + var/icon_screen = "solar" + var/icon_keyboard = "power_key" var/id = 0 var/cdir = 0 var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) @@ -351,19 +354,17 @@ set_panels(cdir) /obj/machinery/power/solar_control/update_icon() - if(stat & BROKEN) - icon_state = "broken" - overlays.Cut() - return - if(stat & NOPOWER) - icon_state = "c_unpowered" - overlays.Cut() - return - icon_state = "solar" overlays.Cut() + if(stat & NOPOWER) + overlays += "[icon_keyboard]_off" + return + overlays += icon_keyboard + if(stat & BROKEN) + overlays += "[icon_state]_broken" + else + overlays += icon_screen if(cdir > -1) overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)) - return /obj/machinery/power/solar_control/attack_hand(mob/user) if(!..()) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index a04bf8dda44..8520b330ec3 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -18,7 +18,7 @@ /obj/machinery/power/supermatter_shard name = "supermatter shard" - desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it." + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it." icon = 'icons/obj/supermatter.dmi' icon_state = "darkmatter_shard" density = 1 @@ -187,6 +187,7 @@ return 1 +/obj/machinery/power/supermatter_shard /obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj) var/turf/L = loc @@ -205,6 +206,16 @@ damage += Proj.damage * config_bullet_energy return 0 +/obj/machinery/power/supermatter_shard/singularity_act() + var/gain = 100 + investigate_log("Supermatter shard consumed by singularity.","singulo") + message_admins("Singularity has consumed a supermatter shard and can now become stage six.") + visible_message("[src] is consumed by the singularity!") + for(var/mob/M in mob_list) + M << 'sound/effects/supermatter.ogg' //everyone goan know bout this + M << "A horrible screeching fills your ears, and a wave of dread washes over you..." + qdel(src) + return(gain) /obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob) return attack_hand(user) @@ -214,11 +225,11 @@ if(Adjacent(user)) return attack_hand(user) else - user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." return /obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob) - user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." /obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob) if(!istype(user)) @@ -272,12 +283,12 @@ var/mob/living/user = AM user.dust() power += 200 - message_admins("[src] has consumed [key_name(user)]? (JMP).") + message_admins("[src] has consumed [key_name_admin(user)]? (FLW) (JMP).") + investigate_log("has consumed [key_name(user)].", "supermatter") else if(isobj(AM) && !istype(AM, /obj/effect)) + investigate_log("has consumed [AM].", "supermatter") qdel(AM) - investigate_log("has consumed [AM].", "supermatter") - power += 200 //Some poor sod got eaten, go ahead and irradiate people nearby. diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 86e3930b58a..405880f4249 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -56,10 +56,8 @@ /obj/machinery/computer/turbine_computer name = "gas turbine control computer" desc = "A computer to remotely control a gas turbine" - icon = 'icons/obj/computer.dmi' - icon_state = "turbinecomp" - anchored = 1 - density = 1 + icon_screen = "turbinecomp" + icon_keyboard = "tech_key" circuit = /obj/item/weapon/circuitboard/turbine_computer var/obj/machinery/power/compressor/compressor var/id = 0 diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 48f4b74cd9c..5afe311cb22 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -31,7 +31,6 @@ caliber = ".45" projectile_type = /obj/item/projectile/bullet/midbullet - /obj/item/ammo_casing/shotgun name = "shotgun slug" desc = "A 12 gauge lead slug." @@ -161,6 +160,18 @@ /obj/item/ammo_casing/shotgun/dart/attackby() return +/obj/item/ammo_casing/shotgun/dart/bioterror + desc = "A shotgun dart filled with deadly toxins." + +/obj/item/ammo_casing/shotgun/dart/bioterror/New() + ..() + reagents.add_reagent("neurotoxin", 5) + reagents.add_reagent("morphine", 5) + reagents.add_reagent("spore", 5) + reagents.add_reagent("mutetoxin", 5) //;HELP OPS IN MAINT + reagents.add_reagent("initropidril", 5) + reagents.add_reagent("sodium_thiopental", 5) + /obj/item/ammo_casing/a762 desc = "A 7.62mm bullet casing." icon_state = "762-casing" @@ -233,7 +244,8 @@ desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." user << "You pop the safety cap off of [src]." else if ((istype(A, /obj/item/weapon/pen)) && modified && !BB.contents.len) - user.drop_item() + if(!user.unEquip(A)) + return A.loc = BB BB.damage = 5 BB.nodamage = 0 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index b1296f8b2cf..3f66bc2b997 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -53,7 +53,7 @@ desc = "Oh god, this shouldn't be here" ammo_type = /obj/item/ammo_casing/shotgun/buckshot caliber = "shotgun" - max_ammo = 8 + max_ammo = 6 multiload = 0 /obj/item/ammo_box/magazine/internal/cylinder/dualshot @@ -134,6 +134,17 @@ ..() icon_state = "45-[ammo_count() ? "8" : "0"]" +/obj/item/ammo_box/magazine/uzim9mm + name = "uzi magazine (9mm)" + icon_state = "uzi9mm-32" + ammo_type = /obj/item/ammo_casing/c9mm + caliber = "9mm" + max_ammo = 32 + +/obj/item/ammo_box/magazine/uzim9mm/update_icon() + ..() + icon_state = "uzi9mm-[round(ammo_count(),4)]" + /obj/item/ammo_box/magazine/smgm9mm name = "SMG magazine (9mm)" icon_state = "smg9mm-20" @@ -203,10 +214,11 @@ obj/item/ammo_box/magazine/tommygunm45 icon_state = "a762-[round(ammo_count(),10)]" + /obj/item/ammo_box/magazine/m12g - name = "shotgun magazine (12g buckshot)" + name = "shotgun magazine (12g slugs)" icon_state = "m12gb" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot + ammo_type = /obj/item/ammo_casing/shotgun origin_tech = "combat=3;syndicate=1" caliber = "shotgun" max_ammo = 8 @@ -215,6 +227,11 @@ obj/item/ammo_box/magazine/tommygunm45 ..() icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*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" @@ -225,6 +242,11 @@ obj/item/ammo_box/magazine/tommygunm45 icon_state = "m12gf" ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath +/obj/item/ammo_box/magazine/m12g/bioterror + name = "shotgun magazine (12g bioterror)" + icon_state = "m12gt" + ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror + /obj/item/ammo_box/magazine/toy name = "foam force META magazine" ammo_type = /obj/item/ammo_casing/caseless/foam_dart diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 9b1666fd2f0..dd9c381e2d6 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -98,8 +98,8 @@ if(heavy_weapon) if(user.get_inactive_hand()) if(prob(15)) - user.visible_message("[src] flies out of [user]'s hands!", "[src] kicks out of your grip!") - user.drop_item() + if(user.drop_item()) + user.visible_message("[src] flies out of [user]'s hands!", "[src] kicks out of your grip!") /obj/item/weapon/gun/emp_act(severity) for(var/obj/O in contents) @@ -235,7 +235,8 @@ if(user.l_hand != src && user.r_hand != src) user << "You'll need [src] in your hands to do that!" return - user.drop_item() + if(!user.unEquip(A)) + return user << "You click [S] into place on [src]." if(S.on) SetLuminosity(0) diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 9ae8b1e8c6f..2075ebeaa60 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -20,7 +20,8 @@ if((istype(I, /obj/item/weapon/grenade))) if(grenades.len < max_grenades) - user.drop_item() + if(!user.unEquip(I)) + return I.loc = src grenades += I user << "You put the grenade in the grenade launcher." diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 66184119b45..7bea46b2f96 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -68,7 +68,8 @@ if(user.l_hand != src && user.r_hand != src) user << "You'll need [src] in your hands to do that." return - user.drop_item() + if(!user.unEquip(A)) + return user << "You screw [S] onto [src]." suppressed = A S.oldsound = fire_sound diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 8a6ffca294b..19545232181 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -106,7 +106,13 @@ icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" return - +/obj/item/weapon/gun/projectile/automatic/mini_uzi + name = "uzi" + desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds." + icon_state = "mini-uzi" + origin_tech = "combat=5;materials=2;syndicate=8" + mag_type = /obj/item/ammo_box/magazine/uzim9mm + burst_size = 2 /obj/item/weapon/gun/projectile/automatic/l6_saw name = "syndicate LMG" @@ -231,7 +237,7 @@ /obj/item/weapon/gun/projectile/automatic/tommygun name = "thompson SMG" - desc = "A genuine 'Chicago Typewriter'." + desc = "Based on the classic 'Chicago Typewriter'." icon_state = "tommygun" item_state = "shotgun" w_class = 5 diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 471b5401196..9e1dc22e592 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -37,7 +37,7 @@ CB.update_icon() num_unloaded++ if (num_unloaded) - user << "You unload [num_unloaded] shell\s from [src]." + user << "You unload [num_unloaded] shell\s from [src]." else user << "[src] is empty!" @@ -79,7 +79,7 @@ playsound(user, fire_sound, 50, 1) user << "[src] blows up in your face!" user.take_organ_damage(0,20) - user.drop_item() + user.unEquip(src) qdel(src) return 0 ..() @@ -170,7 +170,7 @@ CB.update_icon() num_unloaded++ if (num_unloaded) - user << "You unload [num_unloaded] shell\s from [src]." + user << "You unload [num_unloaded] shell\s from [src]." else user << "[src] is empty." diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index e5d5b462c6d..56a312e9c19 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -62,16 +62,6 @@ if (chambered) user << "A [chambered.BB ? "live" : "spent"] one is in the chamber." -// COMBAT SHOTGUN // - -/obj/item/weapon/gun/projectile/shotgun/combat - name = "combat shotgun" - desc = "A traditional shotgun with tactical furniture and an eight-shell capacity underneath." - icon_state = "cshotgun" - origin_tech = "combat=5;materials=2" - mag_type = /obj/item/ammo_box/magazine/internal/shotcom - w_class = 5 - // RIOT SHOTGUN // /obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory @@ -173,7 +163,7 @@ CB.update_icon() num_unloaded++ if (num_unloaded) - user << "You break open \the [src] and unload [num_unloaded] shell\s." + user << "You break open \the [src] and unload [num_unloaded] shell\s." else user << "[src] is empty!" @@ -293,3 +283,17 @@ ..() empty_alarm() return + +/obj/item/weapon/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj) + ..() + src.pump(user) + +// COMBAT SHOTGUN // + +/obj/item/weapon/gun/projectile/shotgun/automatic/combat + name = "combat shotgun" + desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." + icon_state = "cshotgun" + origin_tech = "combat=5;materials=2" + mag_type = /obj/item/ammo_box/magazine/internal/shotcom + w_class = 5 \ No newline at end of file diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 2fb641d6c56..6ed12b01b64 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -56,14 +56,15 @@ S.loc = user.loc syringes.Remove(S) - user << "You unload [S] from \the [src]." + user << "You unload [S] from \the [src]." return 1 /obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1) if(istype(A, /obj/item/weapon/reagent_containers/syringe)) if(syringes.len < max_syringes) - user.drop_item() + if(!user.unEquip(A)) + return user << "You load [A] into \the [src]." syringes.Add(A) A.loc = src diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index acc5f311420..123e35a2fd8 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -30,7 +30,8 @@ user << "You remove [G]'s old pin." if(!G.pin) - user.drop_item() + if(!user.unEquip(src)) + return gun_insert(user, G) user << "You insert [src] into [G]." else diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9542c6a289d..8fc1a4622f9 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -16,7 +16,7 @@ var/atom/original = null // the original target clicked var/turf/starting = null // the projectile's starting turf var/list/permutated = list() // we've passed through these atoms, don't try to hit them again - + var/paused = FALSE //for suspending the projectile midair var/p_x = 16 var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center @@ -108,7 +108,6 @@ loc = target_turf if(A) permutated.Add(A) - Range() return 0 else if(A && A.density && !ismob(A) && !(A.flags & ON_BORDER)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile. @@ -130,17 +129,19 @@ if(kill_count < 1) qdel(src) return - kill_count-- - if((!( current ) || loc == current)) - current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z) - step_towards(src, current) - if((original && original.layer>=2.75) || ismob(original)) - if(loc == get_turf(original)) - if(!(original in permutated)) - Bump(original, 1) + if(!paused) + kill_count-- + if((!( current ) || loc == current)) + current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z) + step_towards(src, current) + if((original && original.layer>=2.75) || ismob(original)) + if(loc == get_turf(original)) + if(!(original in permutated)) + Bump(original, 1) Range() sleep(1) + /obj/item/projectile/Crossed(atom/movable/AM as mob) //A mob moving on a tile with a projectile is hit by it. ..() if(isliving(AM) && AM.density && !checkpass(PASSMOB)) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index e87808254e6..00cd2fc1a42 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -30,6 +30,7 @@ icon_state = "xray" damage = 15 irradiate = 30 + range = 15 forcedodge = 1 /obj/item/projectile/beam/disabler diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index d2f5b3bcc38..efc20cedfd7 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -227,9 +227,10 @@ ready_dna(H) if(H.dna && prob(50)) var/list/all_species = list() - for(var/datum/species/S in typesof(/datum/species) - /datum/species) + for(var/speciestype in typesof(/datum/species) - /datum/species) + var/datum/species/S = new speciestype() if(!S.dangerous_existence) - all_species += S + all_species += speciestype hardset_dna(H, null, null, null, null, pick(all_species)) H.update_icons() else @@ -268,7 +269,7 @@ S.icon = change.icon if(H.mind) H.mind.transfer_to(S) - S << "You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator." + S << "You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator." H = change H.loc = S qdel(src) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 49461bfc6fc..94e40614ab8 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -260,7 +260,7 @@ var/const/INGEST = 2 R.addiction_act_stage4(M) R.addiction_stage++ if(R.addiction_stage > 40) - M << "You feel like you've gotten over your need for [R.name]." + M << "You feel like you've gotten over your need for [R.name]." addiction_list.Remove(R) addiction_tick++ update_total() diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 3dab9a3442a..0fbb8ee12b3 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -155,9 +155,10 @@ if(src.beaker) user << "A beaker is already loaded into the machine!" return + if(!user.drop_item()) + return src.beaker = B - user.drop_item() B.loc = src user << "You add the beaker to the machine." SSnano.update_uis(src) // update all UIs attached to src @@ -290,8 +291,10 @@ if(src.beaker) user << "A beaker is already loaded into the machine!" return + if(!user.drop_item()) + return + src.beaker = B - user.drop_item() B.loc = src user << "You add the beaker to the machine." src.updateUsrDialog() @@ -301,8 +304,10 @@ if(src.loaded_pill_bottle) user << "A pill bottle is already loaded into the machine!" return + if(!user.drop_item()) + return + src.loaded_pill_bottle = B - user.drop_item() B.loc = src user << "You add the pill bottle into the dispenser slot." src.updateUsrDialog() @@ -619,8 +624,10 @@ if(src.beaker) user << "A beaker is already loaded into the machine!" return + if(!user.drop_item()) + return + src.beaker = B - user.drop_item() B.loc = src user << "You add the beaker to the machine." src.updateUsrDialog() @@ -630,8 +637,10 @@ if(src.loaded_pill_bottle) user << "A pill bottle is already loaded into the machine!" return + if(!user.drop_item()) + return + src.loaded_pill_bottle = B - user.drop_item() B.loc = src user << "You add the pill bottle into the dispenser slot." src.updateUsrDialog() @@ -919,9 +928,10 @@ if(src.beaker) user << "A beaker is already loaded into the machine!" return + if(!user.drop_item()) + return src.beaker = I - user.drop_item() I.loc = src user << "You add the beaker to the machine." src.updateUsrDialog() @@ -1053,8 +1063,9 @@ if (beaker) return 1 else + if(!user.drop_item()) + return 1 src.beaker = O - user.drop_item() O.loc = src update_icon() src.updateUsrDialog() @@ -1548,8 +1559,9 @@ if (beaker) return 1 else + if(!user.drop_item()) + return 1 src.beaker = O - user.drop_item() O.loc = src update_icon() src.updateUsrDialog() diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2dede1c153d..2934c57a3c0 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -115,26 +115,26 @@ return /datum/reagent/proc/overdose_start(var/mob/living/M as mob) - M << "You feel like you took too much of [name]!" + M << "You feel like you took too much of [name]!" return /datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob) if(prob(30)) - M << "You feel like some [name] right about now." + M << "You feel like some [name] right about now." return /datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob) if(prob(30)) - M << "You feel like you need [name]. You just can't get enough." + M << "You feel like you need [name]. You just can't get enough." return /datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) if(prob(30)) - M << "You have an intense craving for [name]." + M << "You have an intense craving for [name]." return /datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) if(prob(30)) - M << "You're not feeling good at all! You really need some [name]." + M << "You're not feeling good at all! You really need some [name]." return diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm index a764dc654bf..c9ade32e68b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm @@ -211,4 +211,4 @@ if(message_living && !issilicon(M)) totalmessage += message_living totalmessage += "!" - M << "[totalmessage]" \ No newline at end of file + M << "[totalmessage]" \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm index 1ea2c600caa..7fd49928443 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -57,7 +57,7 @@ overdose_threshold = 200 // Hyperglycaemic shock /datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob) - M << "You go into hyperglycaemic shock! Lay off the twinkies!" + M << "You go into hyperglycaemic shock! Lay off the twinkies!" M.sleeping += 30 return diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index 0b9f8c70847..579caddc98a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -172,7 +172,7 @@ if(prob(20)) M.emote("laugh") if(prob(33)) - M.visible_message("[M]'s hands flip out and flail everywhere!") + M.visible_message("[M]'s hands flip out and flail everywhere!") var/obj/item/I = M.get_active_hand() if(I) M.drop_item() diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index e65a5e81de4..bbb31522bbb 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -494,7 +494,7 @@ if(3) var/mob/living/carbon/human/H = M if(!H.heart_attack) - H.visible_message("[H] clutches at their chest as if their heart stopped!") + H.visible_message("[H] clutches at their chest as if their heart stopped!") H.heart_attack = 1 // rip in pepperoni else H.losebreath += 10 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 7cdb73ae78a..9555c8a126a 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -59,7 +59,7 @@ var/mob/M = get(A, /mob) if(M) - message += " - Carried By: [M.real_name] ([M.key]) (PP) (?)" + message += " - Carried By: [key_name_admin(M)](?) (FLW)" else message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]" diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm index fedbc5d0904..4b265fae1b9 100644 --- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm @@ -59,7 +59,7 @@ required_reagents = list("blackpowder" = 1) result_amount = 1 required_temp = 474 - mix_message = "Sparks start flying around the black powder!" + mix_message = "Sparks start flying around the black powder!" /datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) sleep(rand(50,100)) diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm index be029b2220a..7c26d80e4c2 100644 --- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm +++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm @@ -533,11 +533,29 @@ P.loc = get_turf(holder.my_atom) //Sepia +/datum/chemical_reaction/slimestop + name = "Slime Stop" + id = "m_stop" + result = null + required_reagents = list("plasma" = 1) + result_amount = 1 + required_container = /obj/item/slime_extract/sepia + required_other = 1 + +/datum/chemical_reaction/slimestop/on_reaction(var/datum/reagents/holder) + feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") + var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast) + var/obj/effect/timestop/T = new /obj/effect/timestop + T.loc = get_turf(holder.my_atom) + T.immune = mob + T.timestop() + + /datum/chemical_reaction/slimecamera name = "Slime Camera" id = "m_camera" result = null - required_reagents = list("plasma" = 1) + required_reagents = list("blood" = 1) result_amount = 1 required_container = /obj/item/slime_extract/sepia required_other = 1 @@ -551,7 +569,7 @@ name = "Slime Film" id = "m_film" result = null - required_reagents = list("blood" = 1) + required_reagents = list("water" = 1) result_amount = 1 required_container = /obj/item/slime_extract/sepia required_other = 1 @@ -561,7 +579,10 @@ var/obj/item/device/camera_film/P = new /obj/item/device/camera_film P.loc = get_turf(holder.my_atom) + //Pyrite + + /datum/chemical_reaction/slimepaint name = "Slime Paint" id = "s_paint" @@ -577,4 +598,4 @@ var/chosen = pick(paints) var/obj/P = new chosen if(P) - P.loc = get_turf(holder.my_atom) \ No newline at end of file + P.loc = get_turf(holder.my_atom) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 4ef5f0d72ed..553f6c9cfbc 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -157,7 +157,8 @@ /obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/paper)) - user.drop_item() + if(!user.drop_item()) + return qdel(I) cups++ return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index c17ab572aca..74f51bf24e2 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -110,7 +110,7 @@ if(istype(I, /obj/item/weapon/storage/bag/trash)) var/obj/item/weapon/storage/bag/trash/T = I - user << " You empty the bag." + user << "You empty the bag." for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) T.update_icon() @@ -123,9 +123,9 @@ stuff_mob_in(G.affecting, user) return - if(!I || I.flags & NODROP) return + if(!user.drop_item()) + return - user.drop_item() I.loc = src user.visible_message("[user.name] places \the [I] into \the [src].", \ "You place \the [I] into \the [src].") @@ -345,7 +345,8 @@ src.updateDialog() if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power - flush() + spawn(0) + flush() if(stat & NOPOWER) // won't charge if no power return @@ -378,39 +379,32 @@ update() return -// perform a flush /obj/machinery/disposal/proc/flush() - flushing = 1 - flick("[icon_state]-flush", src) - - var/wrapcheck = 0 - var/obj/structure/disposalholder/H = new() // virtual holder object which actually - // travels through the pipes. - for(var/obj/item/smallDelivery/O in src) - wrapcheck = 1 - - if(wrapcheck == 1) - H.tomail = 1 - + flushAnimation() + var/obj/structure/disposalholder/H = new() + newHolderDestination(H) sleep(10) if(last_sound < world.time + 1) playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0) last_sound = world.time - sleep(5) // wait for animation to finish - - H.init(src) // copy the contents of disposer to holder - air_contents = new() // new empty gas resv. - - H.start(src) // start the holder processing movement + sleep(5) + H.init(src) + air_contents = new() + H.start(src) flushing = 0 - // now reset disposal state flush = 0 - if(mode == 2) // if was ready, - mode = 1 // switch to charging + if(mode == 2) + mode = 1 update() - return +/obj/machinery/disposal/proc/newHolderDestination(obj/structure/disposalholder/H) + for(var/obj/item/smallDelivery/O in src) + H.tomail = 1 + return + +/obj/machinery/disposal/proc/flushAnimation() + flick("[icon_state]-flush", src) // called when area power changes /obj/machinery/disposal/power_change() @@ -490,6 +484,8 @@ //hasmob effects whether the package goes to cargo or its tagged destination. for(var/mob/living/M in D) if(M && M.stat != DEAD) + if(M.client) + M.client.eye = src hasmob = 1 //Checks 1 contents level deep. This means that players can be sent through disposals... @@ -498,6 +494,8 @@ if(O.contents) for(var/mob/living/M in O.contents) if(M && M.stat != DEAD) + if(M.client) + M.client.eye = src hasmob = 1 // now everything inside the disposal gets put into the holder @@ -542,8 +540,6 @@ active = 0 return - - // find the turf which should contain the next pipe /obj/structure/disposalholder/proc/nextloc() return get_step(loc,dir) @@ -979,7 +975,7 @@ sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << " Changed filter to [tag]." + user << "Changed filter to [tag]." updatedesc() @@ -1327,4 +1323,4 @@ else dirs = alldirs.Copy() - src.streak(dirs) + src.streak(dirs) \ No newline at end of file diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index de834c2d80f..f4495358aed 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -234,8 +234,6 @@ desc = "A chute for big and small packages alike!" density = 1 icon_state = "intake" - - var/start_flush = 0 var/c_mode = 0 /obj/machinery/disposal/deliveryChute/New(loc,var/obj/structure/disposalconstruct/make_from) @@ -287,40 +285,11 @@ /obj/mecha/disposalEnterTry() return -/obj/machinery/disposal/deliveryChute/flush() - flushing = 1 +/obj/machinery/disposal/deliveryChute/flushAnimation() flick("intake-closing", src) - var/deliveryCheck = 0 - var/obj/structure/disposalholder/H = new() // virtual holder object which actually - // travels through the pipes. -/* for(var/obj/structure/bigDelivery/O in src) - deliveryCheck = 1 - if(O.sortTag == 0) //This auto-sorts package wrapped objects to disposals - O.sortTag = 1 //Cargo techs can do this themselves with their taggers - for(var/obj/item/smallDelivery/O in src) //With this disabled packages will loop back round and come out the mail chute - deliveryCheck = 1 - if(O.sortTag == 0) - O.sortTag = 1 */ - if(deliveryCheck == 0) - H.destinationTag = 1 - sleep(10) - if((start_flush + 15) < world.time) - start_flush = world.time - playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0) - sleep(5) // wait for animation to finish - - H.init(src) // copy the contents of disposer to holder - air_contents = new() // new empty gas resv. - - H.start(src) // start the holder processing movement - flushing = 0 - // now reset disposal state - flush = 0 - if(mode == 2) // if was ready, - mode = 1 // switch to charging - update() - return +/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H) + H.destinationTag = 1 /obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user, params) if(!I || !user) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index be722fe8fb0..1eeb4731c18 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -152,9 +152,10 @@ if(O.reliability < 90 && O.crit_fail == 0) usr << "Item is neither reliable enough or broken enough to learn from." return + if(!user.drop_item()) + return busy = 1 loaded_item = O - user.drop_item() O.loc = src user << "You add the [O.name] to the machine." flick("h_lathe_load", src) @@ -589,8 +590,8 @@ //~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~ /obj/machinery/r_n_d/experimentor/proc/warn_admins(var/mob/user, var/ReactionName) var/turf/T = get_turf(src) - message_admins("Experimentor reaction: [ReactionName] generated by [key_name(user, user.client)](?) at ([T.x],[T.y],[T.z] - JMP)",0,1) - log_game("Experimentor reaction: [ReactionName] generated by [user.ckey]([user]) in ([T.x],[T.y],[T.z])") + message_admins("Experimentor reaction: [ReactionName] generated by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - JMP)",0,1) + log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in ([T.x],[T.y],[T.z])") #undef SCANTYPE_POKE #undef SCANTYPE_IRRADIATE @@ -733,8 +734,8 @@ //Admin Warning proc for relics /obj/item/weapon/relic/proc/warn_admins(var/mob/user, var/RelicType, var/priority = 1) var/turf/T = get_turf(src) - var/log_msg = "[RelicType] relic used by [user.ckey]([user]) in ([T.x],[T.y],[T.z])" + var/log_msg = "[RelicType] relic used by [key_name(user)] in ([T.x],[T.y],[T.z])" if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK! - message_admins("[RelicType] relic activated by [key_name(user, user.client)](?) in ([T.x],[T.y],[T.z] - JMP)",0,1) + message_admins("[RelicType] relic activated by [key_name_admin(user)](?) (FLW) in ([T.x],[T.y],[T.z] - JMP)",0,1) log_game(log_msg) investigate_log(log_msg, "experimentor") diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 2df53886ab3..6c584bc1a15 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -17,8 +17,9 @@ var/global/list/obj/machinery/message_server/message_servers = list() var/recipient = "Unspecified" //name of the person var/sender = "Unspecified" //name of the sender var/message = "Blank" //transferred message + var/image/photo = null //Attached photo -/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "") +/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "",var/param_photo=null) if(param_rec) recipient = param_rec @@ -26,6 +27,19 @@ var/global/list/obj/machinery/message_server/message_servers = list() sender = param_sender if(param_message) message = param_message + if(param_photo) + photo = param_photo + +/datum/data_pda_msg/Topic(href,href_list) + ..() + if(href_list["photo"]) + var/mob/M = usr + M << browse_rsc(photo, "pda_photo.png") + M << browse("
" \
+ + "", "window=book;size=192x192")
+ onclose(M, "PDA Photo")
/datum/data_rc_msg
var/rec_dpt = "Unspecified" //name of the person
@@ -105,8 +119,9 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "")
chat_msgs += new/datum/data_chat_msg(sender,channel,message)
-/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
- pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
+/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "",var/photo=null)
+ . = new/datum/data_pda_msg(recipient,sender,message,photo)
+ pda_msgs += .
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 9322e7c9286..b616d036397 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -145,7 +145,7 @@ Note: Must be placed west/left of and R&D console to function.
if (disabled)
return
if (!linked_console)
- user << " The [src.name] must be linked to an R&D console first!"
+ user << "The [src.name] must be linked to an R&D console first!"
return 1
if (busy)
user << "The [src.name] is busy! Please wait for completion of previous operation."
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 1bc794782c6..a194ed5327f 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -31,7 +31,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole
name = "R&D Console"
- icon_state = "rdcomp"
+ icon_screen = "rdcomp"
+ icon_keyboard = "rd_key"
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.
var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk.
@@ -154,11 +155,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
else
- user << " Machine cannot accept disks in that format."
+ user << "Machine cannot accept disks in that format."
+ return
+ if(!user.drop_item())
return
- user.drop_item()
D.loc = src
- user << " You add the disk to the machine!"
+ user << "You add the disk to the machine!"
else
..()
src.updateUsrDialog()
@@ -168,7 +170,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << " You disable the security protocols"
+ user << "You disable the security protocols"
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
@@ -237,7 +239,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
@@ -248,7 +250,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ usr << "The destructive analyzer is busy at the moment."
else
var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
@@ -261,7 +263,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_destroy.busy = 0
if(!linked_destroy.hacked)
if(!linked_destroy.loaded_item)
- usr <<" The destructive analyzer appears to be empty."
+ usr <<"The destructive analyzer appears to be empty."
screen = 1.0
return
if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
@@ -307,7 +309,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
screen = 0.0
if(!sync)
- usr << " You must connect to the network first!"
+ usr << "You must connect to the network first!"
else
griefProtection() //Putting this here because I dont trust the sync process
spawn(30)
@@ -753,7 +755,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(1.7) //R&D device linkage
dat += "Main Menu"
- dat += "Settings Menu "
+ dat += "Settings Menu
"
dat += "
" dat += "Re-sync with Nearby Devices
" dat += "
" @@ -809,12 +811,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
" dat += "Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
" - dat += "
" dat += list_categories(linked_lathe.categories, 3.15) @@ -963,12 +965,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Material Amount: [linked_imprinter.TotalMaterials()]
" dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
" - dat += "
" dat += list_categories(linked_imprinter.categories, 4.15) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 62dd6e45bac..fb56e869fe8 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -177,7 +177,8 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" desc = "Used to manage access to research and manufacturing databases." - icon_state = "rdcomp" + icon_screen = "rdcomp" + icon_keyboard = "rd_key" var/screen = 0 var/obj/machinery/r_n_d/server/temp_server var/list/servers = list() @@ -192,7 +193,7 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - usr << " You do not have the required access level." + usr << "You do not have the required access level." return if(href_list["main"]) @@ -269,7 +270,7 @@ if(istype(S, /obj/machinery/r_n_d/server/centcom) && !badmin) continue dat += "[S.name] || " - dat += " Access Rights | " + dat += "Access Rights | " dat += "Data Management" if(badmin) dat += " | Server-to-Server Transfer" dat += "
" @@ -310,7 +311,7 @@ dat += "[temp_server.name] Server to Server Transfer
" dat += "Send Data to what server?
" for(var/obj/machinery/r_n_d/server/S in servers) - dat += "[S.name] (Transfer)
" + dat += "[S.name] (Transfer)
" dat += "
Main Menu" user << browse("R&D Server Control
[dat]", "window=server_control;size=575x400") onclose(user, "server_control") @@ -325,7 +326,7 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << " You you disable the security protocols." + user << "You you disable the security protocols." /obj/machinery/r_n_d/server/robotics name = "Robotics R&D Server" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f6693492790..fd4c133308f 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -18,10 +18,10 @@ /obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) - user << " This extract has already been enhanced!" + user << "This extract has already been enhanced!" return ..() if(Uses == 0) - user << " You can't enhance a used extract!" + user << "You can't enhance a used extract!" return ..() user <<"You apply the enhancer. It now has triple the amount of uses." Uses = 3 @@ -138,8 +138,8 @@ M.docile = 1 M.nutrition = 700 - M <<" You absorb the potion and feel your intense desire to feed melt away." - user <<" You feed the slime the potion, removing it's hunger and calming it." + M <<"You absorb the potion and feel your intense desire to feed melt away." + user <<"You feed the slime the potion, removing it's hunger and calming it." var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN) if (!newname) @@ -220,16 +220,16 @@ /obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M))//If target is not a slime. - user << " The steroid only works on baby slimes!" + user << "The steroid only works on baby slimes!" return ..() if(M.is_adult) //Can't tame adults - user << " Only baby slimes can use the steroid!" + user << "Only baby slimes can use the steroid!" return..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.cores == 3) - user <<" The slime already has the maximum amount of extract!" + user <<"The slime already has the maximum amount of extract!" return..() user <<"You feed the slime the steroid. It now has triple the amount of extract." @@ -252,10 +252,10 @@ /*afterattack(obj/target, mob/user , flag) if(istype(target, /obj/item/slime_extract)) if(target.enhanced == 1) - user << " This extract has already been enhanced!" + user << "This extract has already been enhanced!" return ..() if(target.Uses == 0) - user << " You can't enhance a used extract!" + user << "You can't enhance a used extract!" return ..() user <<"You apply the enhancer. It now has triple the amount of uses." target.Uses = 3 @@ -271,13 +271,13 @@ /obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M)) - user << " The stabilizer only works on slimes!" + user << "The stabilizer only works on slimes!" return ..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.mutation_chance == 0) - user <<" The slime already has no chance of mutating!" + user <<"The slime already has no chance of mutating!" return..() user <<"You feed the slime the stabilizer. It is now less likely to mutate." @@ -292,16 +292,16 @@ /obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M)) - user << " The mutator only works on slimes!" + user << "The mutator only works on slimes!" return ..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.mutator_used) - user << " This slime has already consumed a mutator, any more would be far too unstable!" + user << "This slime has already consumed a mutator, any more would be far too unstable!" return..() if(M.mutation_chance == 100) - user <<" The slime is already guaranteed to mutate!" + user <<"The slime is already guaranteed to mutate!" return..() user <<"You feed the slime the mutator. It is now more likely to mutate." @@ -418,3 +418,57 @@ G.key = ghost.key G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost." qdel(src) + + + + +/obj/effect/timestop + anchored = 1 + name = "chronofield" + desc = "ZA WARUDO" + icon = 'icons/effects/160x160.dmi' + icon_state = "time" + layer = FLY_LAYER + pixel_x = -64 + pixel_y = -64 + unacidable = 1 + var/mob/living/immune = null // the one who creates the timestop is immune + var/freezerange = 2 + var/duration = 140 + alpha = 125 + +/obj/effect/timestop/New() + ..() + timestop() + + +/obj/effect/timestop/proc/timestop() + playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1) + while(loc) + if(duration) + for(var/mob/living/M in orange (freezerange, src.loc)) + if(M == immune) + continue + M.stunned = 10 + M.anchored = 1 + if(istype(M, /mob/living/simple_animal/hostile)) + var/mob/living/simple_animal/hostile/H = M + H.AIStatus = AI_OFF + H.LoseTarget() + continue + for(var/obj/item/projectile/P in orange (freezerange, src.loc)) + P.paused = TRUE + duration -- + else + for(var/mob/living/M in orange (freezerange+2, src.loc)) //longer range incase they lag out of it or something + M.stunned = 0 + M.anchored = 0 + if(istype(M, /mob/living/simple_animal/hostile)) + var/mob/living/simple_animal/hostile/H = M + H.AIStatus = initial(H.AIStatus) + continue + for(var/obj/item/projectile/P in orange(freezerange+2, src.loc)) + P.paused = FALSE + qdel(src) + return + sleep(1) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index b60a0d7bfe5..673e7176eaa 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -482,8 +482,8 @@ /obj/machinery/computer/shuttle name = "Shuttle Console" - icon = 'icons/obj/computer.dmi' - icon_state = "shuttle" + icon_screen = "shuttle" + icon_keyboard = "tech_key" req_access = list( ) circuit = /obj/item/weapon/circuitboard/shuttle var/shuttleId @@ -544,7 +544,7 @@ if(!emagged) src.req_access = list() emagged = 1 - user << " You fried the consoles ID checking system." + user << "You fried the consoles ID checking system." /obj/machinery/computer/shuttle/ferry name = "transport ferry console" @@ -567,7 +567,7 @@ return cooldown = 1 usr << "Your request has been recieved by Centcom." - admins << "FERRY: [key_name(usr)] (?) (JMP) (Move Ferry) is requesting to move the transport ferry to Centcom." + admins << "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom." spawn(600) //One minute cooldown cooldown = 0 diff --git a/code/modules/surgery/cybernetic_implants.dm b/code/modules/surgery/cybernetic_implants.dm index 3f4dcb5210c..ced4776f535 100644 --- a/code/modules/surgery/cybernetic_implants.dm +++ b/code/modules/surgery/cybernetic_implants.dm @@ -70,9 +70,10 @@ if(full) user << "You can't seem to implant anything else into the [target]'s [target_zone]!" else + if(!user.drop_item()) + return user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].") implant.owner = target implant.function() - user.drop_item() target.internal_organs |= implant implant.loc = target \ No newline at end of file diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index 950c4a536b0..22d168044c0 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -71,6 +71,8 @@ user << "That is the wrong robotic limb for this body part." return 0 + if(!user.drop_item()) + return 0 var/mob/living/carbon/human/H = target user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "You successfully augment [target]'s [parse_zone(target_zone)].") L.loc = get_turf(target) @@ -92,7 +94,6 @@ H.organs += new /obj/item/organ/limb/robot/chest(src) for(var/datum/disease/appendicitis/A in H.viruses) //If they already have Appendicitis, Remove it A.cure(1) - user.drop_item() qdel(tool) H.update_damage_overlays(0) H.update_augments() //Gives them the Cyber limb overlay diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index df88239994d..2025f3c155b 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -188,4 +188,12 @@ for(var/obj/item/organ/limb/L in organs) for(var/obj/item/I in L.embedded_objects) L.embedded_objects -= I - I.loc = T \ No newline at end of file + I.loc = T + + clear_alert("embeddedobject") + +/mob/living/carbon/human/proc/has_embedded_objects() + . = 0 + for(var/obj/item/organ/limb/L in organs) + for(var/obj/item/I in L.embedded_objects) + return 1 \ No newline at end of file diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index 33968dd8968..f8e7de333d9 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -33,6 +33,9 @@ I.loc = get_turf(H) L.embedded_objects -= I + if(!H.has_embedded_objects()) + H.clear_alert("embeddedobject") + if(objects > 0) user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].") else diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index c006939d876..74b9807dade 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -21,7 +21,7 @@ PoolOrNew(/obj/effect/effect/sparks, loc) playsound(src.loc, "sparks", 50, 1) blink_mob(user) - user.drop_item() + user.unEquip(src) qdel(src) /obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 7949dcfba88..e1f4a37d288 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -35,7 +35,7 @@ if(istype(I, /obj/item/device/multitool)) var/obj/item/device/multitool/M = I M.buffer = src - user << "You save the data in the [I.name]'s buffer." + user << "You save the data in the [I.name]'s buffer." if(exchange_parts(user, I)) return @@ -60,22 +60,22 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << " \The [src] can now be moved." + user << "\The [src] can now be moved." else if(!anchored) anchored = 1 - user << " \The [src] is now secured." + user << "\The [src] is now secured." if(istype(W, /obj/item/weapon/screwdriver)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You unscrew the telepad's tracking beacon." + user << "You unscrew the telepad's tracking beacon." stage = 1 else if(stage == 1) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You screw in the telepad's tracking beacon." + user << "You screw in the telepad's tracking beacon." stage = 0 if(istype(W, /obj/item/weapon/weldingtool) && stage == 1) playsound(src, 'sound/items/Welder.ogg', 50, 1) - user << " You disassemble the telepad." + user << "You disassemble the telepad." new /obj/item/stack/sheet/metal(get_turf(src)) new /obj/item/stack/sheet/glass(get_turf(src)) qdel(src) @@ -91,7 +91,7 @@ /obj/item/device/telepad_beacon/attack_self(mob/user as mob) if(user) - user << " Locked In" + user << "Locked In" new /obj/machinery/telepad_cargo(user.loc) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -142,11 +142,11 @@ if(mode == 0) mode = 1 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " The telepad locator has become uncalibrated." + user << "The telepad locator has become uncalibrated." else mode = 0 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " You calibrate the telepad locator." + user << "You calibrate the telepad locator." /obj/item/weapon/rcs/emag_act(mob/user as mob) if(!emagged) @@ -154,4 +154,4 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) s.start() - user << " You emag the RCS. Click on it to toggle between modes." + user << "You emag the RCS. Click on it to toggle between modes." diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 6d602467fa1..0450b8109c1 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -58,7 +58,8 @@ if(crystals.len >= max_crystals) user << "There are not enough crystal slots." return - user.drop_item() + if(!user.drop_item()) + return crystals += W W.loc = null user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "You insert [W] into \the [src]'s crystal slot.") @@ -74,7 +75,7 @@ if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null - user << "You upload the data from the [W.name]'s buffer." + user << "You upload the data from the [W.name]'s buffer." else ..() diff --git a/config/game_options.txt b/config/game_options.txt index ed44c926e10..9c62544f085 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -280,3 +280,18 @@ MIDROUND_ANTAG_LIFE_CHECK 0.7 //Uncomment for explosions that react to doors and walls REACTIONARY_EXPLOSIONS +### Configure the bomb cap +## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out. +## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4. +## eg: If you give the number 20. The bomb cap will be 5,10,20. +## Can be any number between 4 and 128, some examples are provided below. + +## Default (3,7,14) +BOMBCAP 14 +## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above) +#BOMBCAP 16 +## LagHell (7,14,28) +#BOMBCAP 28 + + + diff --git a/config/tips.txt b/config/tips.txt index dd6b2f23f85..04ea4ab50d0 100644 --- a/config/tips.txt +++ b/config/tips.txt @@ -85,3 +85,6 @@ You can use . or # instead of : for radio channels. Building this habit reduces While pulling something, clicking on a tile with an empty hand will move it to that tile. No more getting stuck in maint while dragging something! Things that override clicks like decks of cards or paper bins can still be picked up by dragging them to your character. Equipped things that override click can be unequipped by dragging it to an empty hand. In the job selection menu, from the lobby, you can use right click on the "Low/Medium/High" priority button to make it cycle backwards. +If you stay out of camera range for 10 seconds, the AI's track on you will break. +You can shoot cameras with bullets to disable them remotely. +Disabling a camera with wirecutters will not cause a camera alarm, but bludgeoning it will. diff --git a/html/changelog.html b/html/changelog.html index 69c3bf7818a..457de93df40 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,59 @@ -->
R&D Console Device Linkage Menu:
" dat += "Re-sync with Nearby Devices
" dat += "
Linked Devices:
" @@ -809,12 +811,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
" dat += "Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
" - dat += "
" dat += list_categories(linked_lathe.categories, 3.15) @@ -963,12 +965,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Material Amount: [linked_imprinter.TotalMaterials()]
" dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
" - dat += "
" dat += list_categories(linked_imprinter.categories, 4.15) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 62dd6e45bac..fb56e869fe8 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -177,7 +177,8 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" desc = "Used to manage access to research and manufacturing databases." - icon_state = "rdcomp" + icon_screen = "rdcomp" + icon_keyboard = "rd_key" var/screen = 0 var/obj/machinery/r_n_d/server/temp_server var/list/servers = list() @@ -192,7 +193,7 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - usr << " You do not have the required access level." + usr << "You do not have the required access level." return if(href_list["main"]) @@ -269,7 +270,7 @@ if(istype(S, /obj/machinery/r_n_d/server/centcom) && !badmin) continue dat += "[S.name] || " - dat += " Access Rights | " + dat += "Access Rights | " dat += "Data Management" if(badmin) dat += " | Server-to-Server Transfer" dat += "
" @@ -310,7 +311,7 @@ dat += "[temp_server.name] Server to Server Transfer
" dat += "Send Data to what server?
" for(var/obj/machinery/r_n_d/server/S in servers) - dat += "[S.name] (Transfer)
" + dat += "[S.name] (Transfer)
" dat += "
Main Menu" user << browse("
[dat]", "window=server_control;size=575x400") onclose(user, "server_control") @@ -325,7 +326,7 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << " You you disable the security protocols." + user << "You you disable the security protocols." /obj/machinery/r_n_d/server/robotics name = "Robotics R&D Server" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f6693492790..fd4c133308f 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -18,10 +18,10 @@ /obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) - user << " This extract has already been enhanced!" + user << "This extract has already been enhanced!" return ..() if(Uses == 0) - user << " You can't enhance a used extract!" + user << "You can't enhance a used extract!" return ..() user <<"You apply the enhancer. It now has triple the amount of uses." Uses = 3 @@ -138,8 +138,8 @@ M.docile = 1 M.nutrition = 700 - M <<" You absorb the potion and feel your intense desire to feed melt away." - user <<" You feed the slime the potion, removing it's hunger and calming it." + M <<"You absorb the potion and feel your intense desire to feed melt away." + user <<"You feed the slime the potion, removing it's hunger and calming it." var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN) if (!newname) @@ -220,16 +220,16 @@ /obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M))//If target is not a slime. - user << " The steroid only works on baby slimes!" + user << "The steroid only works on baby slimes!" return ..() if(M.is_adult) //Can't tame adults - user << " Only baby slimes can use the steroid!" + user << "Only baby slimes can use the steroid!" return..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.cores == 3) - user <<" The slime already has the maximum amount of extract!" + user <<"The slime already has the maximum amount of extract!" return..() user <<"You feed the slime the steroid. It now has triple the amount of extract." @@ -252,10 +252,10 @@ /*afterattack(obj/target, mob/user , flag) if(istype(target, /obj/item/slime_extract)) if(target.enhanced == 1) - user << " This extract has already been enhanced!" + user << "This extract has already been enhanced!" return ..() if(target.Uses == 0) - user << " You can't enhance a used extract!" + user << "You can't enhance a used extract!" return ..() user <<"You apply the enhancer. It now has triple the amount of uses." target.Uses = 3 @@ -271,13 +271,13 @@ /obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M)) - user << " The stabilizer only works on slimes!" + user << "The stabilizer only works on slimes!" return ..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.mutation_chance == 0) - user <<" The slime already has no chance of mutating!" + user <<"The slime already has no chance of mutating!" return..() user <<"You feed the slime the stabilizer. It is now less likely to mutate." @@ -292,16 +292,16 @@ /obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) if(!isslime(M)) - user << " The mutator only works on slimes!" + user << "The mutator only works on slimes!" return ..() if(M.stat) - user << " The slime is dead!" + user << "The slime is dead!" return..() if(M.mutator_used) - user << " This slime has already consumed a mutator, any more would be far too unstable!" + user << "This slime has already consumed a mutator, any more would be far too unstable!" return..() if(M.mutation_chance == 100) - user <<" The slime is already guaranteed to mutate!" + user <<"The slime is already guaranteed to mutate!" return..() user <<"You feed the slime the mutator. It is now more likely to mutate." @@ -418,3 +418,57 @@ G.key = ghost.key G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost." qdel(src) + + + + +/obj/effect/timestop + anchored = 1 + name = "chronofield" + desc = "ZA WARUDO" + icon = 'icons/effects/160x160.dmi' + icon_state = "time" + layer = FLY_LAYER + pixel_x = -64 + pixel_y = -64 + unacidable = 1 + var/mob/living/immune = null // the one who creates the timestop is immune + var/freezerange = 2 + var/duration = 140 + alpha = 125 + +/obj/effect/timestop/New() + ..() + timestop() + + +/obj/effect/timestop/proc/timestop() + playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1) + while(loc) + if(duration) + for(var/mob/living/M in orange (freezerange, src.loc)) + if(M == immune) + continue + M.stunned = 10 + M.anchored = 1 + if(istype(M, /mob/living/simple_animal/hostile)) + var/mob/living/simple_animal/hostile/H = M + H.AIStatus = AI_OFF + H.LoseTarget() + continue + for(var/obj/item/projectile/P in orange (freezerange, src.loc)) + P.paused = TRUE + duration -- + else + for(var/mob/living/M in orange (freezerange+2, src.loc)) //longer range incase they lag out of it or something + M.stunned = 0 + M.anchored = 0 + if(istype(M, /mob/living/simple_animal/hostile)) + var/mob/living/simple_animal/hostile/H = M + H.AIStatus = initial(H.AIStatus) + continue + for(var/obj/item/projectile/P in orange(freezerange+2, src.loc)) + P.paused = FALSE + qdel(src) + return + sleep(1) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index b60a0d7bfe5..673e7176eaa 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -482,8 +482,8 @@ /obj/machinery/computer/shuttle name = "Shuttle Console" - icon = 'icons/obj/computer.dmi' - icon_state = "shuttle" + icon_screen = "shuttle" + icon_keyboard = "tech_key" req_access = list( ) circuit = /obj/item/weapon/circuitboard/shuttle var/shuttleId @@ -544,7 +544,7 @@ if(!emagged) src.req_access = list() emagged = 1 - user << " You fried the consoles ID checking system." + user << "You fried the consoles ID checking system." /obj/machinery/computer/shuttle/ferry name = "transport ferry console" @@ -567,7 +567,7 @@ return cooldown = 1 usr << "Your request has been recieved by Centcom." - admins << "FERRY: [key_name(usr)] (?) (JMP) (Move Ferry) is requesting to move the transport ferry to Centcom." + admins << "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom." spawn(600) //One minute cooldown cooldown = 0 diff --git a/code/modules/surgery/cybernetic_implants.dm b/code/modules/surgery/cybernetic_implants.dm index 3f4dcb5210c..ced4776f535 100644 --- a/code/modules/surgery/cybernetic_implants.dm +++ b/code/modules/surgery/cybernetic_implants.dm @@ -70,9 +70,10 @@ if(full) user << "You can't seem to implant anything else into the [target]'s [target_zone]!" else + if(!user.drop_item()) + return user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].") implant.owner = target implant.function() - user.drop_item() target.internal_organs |= implant implant.loc = target \ No newline at end of file diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index 950c4a536b0..22d168044c0 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -71,6 +71,8 @@ user << "That is the wrong robotic limb for this body part." return 0 + if(!user.drop_item()) + return 0 var/mob/living/carbon/human/H = target user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "You successfully augment [target]'s [parse_zone(target_zone)].") L.loc = get_turf(target) @@ -92,7 +94,6 @@ H.organs += new /obj/item/organ/limb/robot/chest(src) for(var/datum/disease/appendicitis/A in H.viruses) //If they already have Appendicitis, Remove it A.cure(1) - user.drop_item() qdel(tool) H.update_damage_overlays(0) H.update_augments() //Gives them the Cyber limb overlay diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index df88239994d..2025f3c155b 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -188,4 +188,12 @@ for(var/obj/item/organ/limb/L in organs) for(var/obj/item/I in L.embedded_objects) L.embedded_objects -= I - I.loc = T \ No newline at end of file + I.loc = T + + clear_alert("embeddedobject") + +/mob/living/carbon/human/proc/has_embedded_objects() + . = 0 + for(var/obj/item/organ/limb/L in organs) + for(var/obj/item/I in L.embedded_objects) + return 1 \ No newline at end of file diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index 33968dd8968..f8e7de333d9 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -33,6 +33,9 @@ I.loc = get_turf(H) L.embedded_objects -= I + if(!H.has_embedded_objects()) + H.clear_alert("embeddedobject") + if(objects > 0) user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].") else diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index c006939d876..74b9807dade 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -21,7 +21,7 @@ PoolOrNew(/obj/effect/effect/sparks, loc) playsound(src.loc, "sparks", 50, 1) blink_mob(user) - user.drop_item() + user.unEquip(src) qdel(src) /obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 7949dcfba88..e1f4a37d288 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -35,7 +35,7 @@ if(istype(I, /obj/item/device/multitool)) var/obj/item/device/multitool/M = I M.buffer = src - user << "You save the data in the [I.name]'s buffer." + user << "You save the data in the [I.name]'s buffer." if(exchange_parts(user, I)) return @@ -60,22 +60,22 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << " \The [src] can now be moved." + user << "\The [src] can now be moved." else if(!anchored) anchored = 1 - user << " \The [src] is now secured." + user << "\The [src] is now secured." if(istype(W, /obj/item/weapon/screwdriver)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You unscrew the telepad's tracking beacon." + user << "You unscrew the telepad's tracking beacon." stage = 1 else if(stage == 1) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You screw in the telepad's tracking beacon." + user << "You screw in the telepad's tracking beacon." stage = 0 if(istype(W, /obj/item/weapon/weldingtool) && stage == 1) playsound(src, 'sound/items/Welder.ogg', 50, 1) - user << " You disassemble the telepad." + user << "You disassemble the telepad." new /obj/item/stack/sheet/metal(get_turf(src)) new /obj/item/stack/sheet/glass(get_turf(src)) qdel(src) @@ -91,7 +91,7 @@ /obj/item/device/telepad_beacon/attack_self(mob/user as mob) if(user) - user << " Locked In" + user << "Locked In" new /obj/machinery/telepad_cargo(user.loc) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -142,11 +142,11 @@ if(mode == 0) mode = 1 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " The telepad locator has become uncalibrated." + user << "The telepad locator has become uncalibrated." else mode = 0 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " You calibrate the telepad locator." + user << "You calibrate the telepad locator." /obj/item/weapon/rcs/emag_act(mob/user as mob) if(!emagged) @@ -154,4 +154,4 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) s.start() - user << " You emag the RCS. Click on it to toggle between modes." + user << "You emag the RCS. Click on it to toggle between modes." diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 6d602467fa1..0450b8109c1 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -58,7 +58,8 @@ if(crystals.len >= max_crystals) user << "There are not enough crystal slots." return - user.drop_item() + if(!user.drop_item()) + return crystals += W W.loc = null user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "You insert [W] into \the [src]'s crystal slot.") @@ -74,7 +75,7 @@ if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null - user << "You upload the data from the [W.name]'s buffer." + user << "You upload the data from the [W.name]'s buffer." else ..() diff --git a/config/game_options.txt b/config/game_options.txt index ed44c926e10..9c62544f085 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -280,3 +280,18 @@ MIDROUND_ANTAG_LIFE_CHECK 0.7 //Uncomment for explosions that react to doors and walls REACTIONARY_EXPLOSIONS +### Configure the bomb cap +## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out. +## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4. +## eg: If you give the number 20. The bomb cap will be 5,10,20. +## Can be any number between 4 and 128, some examples are provided below. + +## Default (3,7,14) +BOMBCAP 14 +## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above) +#BOMBCAP 16 +## LagHell (7,14,28) +#BOMBCAP 28 + + + diff --git a/config/tips.txt b/config/tips.txt index dd6b2f23f85..04ea4ab50d0 100644 --- a/config/tips.txt +++ b/config/tips.txt @@ -85,3 +85,6 @@ You can use . or # instead of : for radio channels. Building this habit reduces While pulling something, clicking on a tile with an empty hand will move it to that tile. No more getting stuck in maint while dragging something! Things that override clicks like decks of cards or paper bins can still be picked up by dragging them to your character. Equipped things that override click can be unequipped by dragging it to an empty hand. In the job selection menu, from the lobby, you can use right click on the "Low/Medium/High" priority button to make it cycle backwards. +If you stay out of camera range for 10 seconds, the AI's track on you will break. +You can shoot cameras with bullets to disable them remotely. +Disabling a camera with wirecutters will not cause a camera alarm, but bludgeoning it will. diff --git a/html/changelog.html b/html/changelog.html index 69c3bf7818a..457de93df40 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,59 @@ -->
+
18 June 2015
+AnturK updated:
+-
+
Ikarrus updated:
+-
+
Miauw updated:
+-
+
Xhuis updated:
+-
+
phil235 updated:
+-
+
15 June 2015
+Incoming5643 updated:
+-
+
Kor updated:
+-
+
spasticVerbalizer updated:
+-
+
14 June 2015
+Ikarrus updated:
+-
+
12 June 2015
Ikarrus updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e7f6df25d6e..bd40cc75ed7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2751,3 +2751,48 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
RemieRichards:
- rscadd: New optional explosion effect ported from /vg/'s DeityLink, Explosions
that are affected by Walls and Doors
+2015-06-14:
+ Ikarrus:
+ - rscadd: White suits added to gang outfits
+ - tweak: Gang outfits are now free, but are now limited in stock (that replenishes
+ over time)
+ - tweak: While attempting a Hostile Takeover, gangs do not gain influence. Instead,
+ the takeover timer will be reduced by how many territories they control.
+ - tweak: Spraycan cost reduced to 5 influence.
+ - tweak: Recruitment Pen cooldown increased to 2 minutes, but is reduced if the
+ enemy gang has more members than yours.
+ - tweak: Tommy guns no longer deal stamina damage.
+ - rscdel: Gangtools can no longer recall the shuttle if the game mode is not Gang
+ War
+2015-06-15:
+ Incoming5643:
+ - rscadd: Lizards can now choose from a wide varity of physical appearances in character
+ creation! Sprites made by WJohn. Hiss Responsibly.
+ Kor:
+ - rscadd: A terrible new creature stalks the halls of SS13.
+ - rscadd: The wizard has a new artefact related to said creature.
+ - rscadd: Added a new sepia slime plasma reaction. Try it out!
+ spasticVerbalizer:
+ - rscfix: Drones can now properly quick-equip.
+2015-06-18:
+ AnturK:
+ - rscadd: Added new photo-over-pda function. Apply the photo to PDA to send it with
+ your next message!
+ Ikarrus:
+ - rscadd: Department Management consoles have been added to Head of Staff offices.
+ These will enable heads to modify ID's access to their department, as well as
+ preform demotions.
+ Miauw:
+ - tweak: Bullets can now damage cameras.
+ - tweak: Camera alarms now trigger 90 seconds after the first EMP pulse, instead
+ of when all EMP pulses run out.
+ - tweak: Makes the force required to damage cameras greater than or equal to ten
+ instead of greater than ten.
+ - tweak: Camera alarms now trigger when cameras are disabled with brute force or
+ bullets.
+ Xhuis:
+ - rscadd: Nanotrasen scientists have determined that a delaminating supermatter
+ shard combining with a gravitational singularity is an extremely bad idea. They
+ advise keeping the two as far apart as possible.
+ phil235:
+ - rscdel: Nerfed the xray gun. Its range is now 15 tiles.
diff --git a/html/changelogs/Dorsisdwarf-9800-nukeops.yml b/html/changelogs/Dorsisdwarf-9800-nukeops.yml
new file mode 100644
index 00000000000..e7d2d895ab2
--- /dev/null
+++ b/html/changelogs/Dorsisdwarf-9800-nukeops.yml
@@ -0,0 +1,15 @@
+
+# Your name.
+author: Dorsisdwarf
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Syndicate Bulldog Shotguns now use slug ammo instead of buckshot by default"
+ - rscadd: "Nuke Ops can now buy team grab-bags of bulldog ammo at a discount."
diff --git a/html/changelogs/Ikarrus-gangimplants.yml b/html/changelogs/Ikarrus-gangimplants.yml
new file mode 100644
index 00000000000..000f9bd487f
--- /dev/null
+++ b/html/changelogs/Ikarrus-gangimplants.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# spellcheck (typo fixes)
+# experiment
+# tgs (TG-ported fixes?)
+#################################
+
+# Your name.
+author: Ikarrus
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscdel: "Loyalty implants now treat gangs as it treats cultis. Implants can no longer deconvert gangsters, but it can still prevent recruitments."
+ - tweak: "Replaced tommy guns with 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis."
\ No newline at end of file
diff --git a/html/changelogs/Thunder12345-PR-10019.yml b/html/changelogs/Thunder12345-PR-10019.yml
new file mode 100644
index 00000000000..3a8e974e08c
--- /dev/null
+++ b/html/changelogs/Thunder12345-PR-10019.yml
@@ -0,0 +1,7 @@
+author: Thunder12345
+
+delete-after: True
+
+changes:
+ - rscadd: "Combat shotguns are now semi automatic, and will be pumped automatically after firing."
+ - tweak: "Combat shotgun capacity has been reduced to six shells."
\ No newline at end of file
diff --git a/html/changelogs/Xhuis-SummerThaw.yml b/html/changelogs/Xhuis-SummerThaw.yml
new file mode 100644
index 00000000000..0a55acf9e06
--- /dev/null
+++ b/html/changelogs/Xhuis-SummerThaw.yml
@@ -0,0 +1,11 @@
+author: Xhuis
+delete-after: True
+
+changes:
+ - rscadd: "You will now trip over securitrons if you run over them whilst they are chasing a target."
+ - rscadd: "An admin-spawnable drone dispenser has been added that will automatically create drone shells when supplied with materials."
+ - rscadd: "Airlock charges are available to traitors and will cause a lethal explosion on the next person to open the door."
+ - rscadd: "Nuclear operatives can now buy drum magazines for their Bulldog shotguns filled with lethal poison-filled darts."
+ - rscadd: "When a malfunctioning AI declares Delta, all blue tiles in its core will begin flashing red."
+ - rscadd: "Back-worn cloaks have been added for all heads except the HoP. LARPers rejoice!"
+ - rscadd: "More suicide messages have been added for a few items."
diff --git a/html/changelogs/jordie adminstuff.yml b/html/changelogs/jordie adminstuff.yml
new file mode 100644
index 00000000000..a9d4ef9d62a
--- /dev/null
+++ b/html/changelogs/jordie adminstuff.yml
@@ -0,0 +1,9 @@
+author: Jordie0608
+
+delete-after: True
+
+changes:
+ - tweak: "For Admins: Jump-to-Mob (JMP) notification command replaced with Follow (FLW)."
+ - rscadd: "Message and Follow links added to many notifications."
+ - rscadd: "New buttons to toggle nuke and set security level."
+ - spellcheck: "Flamethrowers are logged in attack_log."
\ No newline at end of file
diff --git a/icons/effects/160x160.dmi b/icons/effects/160x160.dmi
index 57e3a81edf1..8c733232f93 100644
Binary files a/icons/effects/160x160.dmi and b/icons/effects/160x160.dmi differ
diff --git a/icons/effects/352x352.dmi b/icons/effects/352x352.dmi
new file mode 100644
index 00000000000..86b40959d56
Binary files /dev/null and b/icons/effects/352x352.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index c59228819bb..0e417793b0c 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 7b47bec0962..8f924ee6632 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 4347cde3677..3bbd054bce7 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi
index 6221fbad9e7..94acba1cbc5 100644
Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 7a0c7a6599a..0ed43592376 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 3258cb936d1..1c9beb6551c 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/cloaks.dmi b/icons/obj/clothing/cloaks.dmi
new file mode 100644
index 00000000000..3677fa15258
Binary files /dev/null and b/icons/obj/clothing/cloaks.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 4a7846286da..6c8fd8bc903 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 5a3e80c66f7..092eb92a6ce 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index c613bee4949..61e622a2135 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/machines/droneDispenser.dmi b/icons/obj/machines/droneDispenser.dmi
new file mode 100644
index 00000000000..a78990d8a1a
Binary files /dev/null and b/icons/obj/machines/droneDispenser.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 682103c7dcb..f7d418e6fcb 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index e3eec0a88ac..3624a9b4bff 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/sound/magic/Demon_consume.ogg b/sound/magic/Demon_consume.ogg
new file mode 100644
index 00000000000..ef9276e74c0
Binary files /dev/null and b/sound/magic/Demon_consume.ogg differ
diff --git a/sound/magic/TIMEPARADOX2.ogg b/sound/magic/TIMEPARADOX2.ogg
new file mode 100644
index 00000000000..d35aeb389f6
Binary files /dev/null and b/sound/magic/TIMEPARADOX2.ogg differ
diff --git a/sound/magic/demon_attack1.ogg b/sound/magic/demon_attack1.ogg
new file mode 100644
index 00000000000..e3c765afd0c
Binary files /dev/null and b/sound/magic/demon_attack1.ogg differ
diff --git a/sound/magic/demon_dies.ogg b/sound/magic/demon_dies.ogg
new file mode 100644
index 00000000000..ad2a95f397d
Binary files /dev/null and b/sound/magic/demon_dies.ogg differ
diff --git a/sound/magic/enter_blood.ogg b/sound/magic/enter_blood.ogg
new file mode 100644
index 00000000000..4deba11b465
Binary files /dev/null and b/sound/magic/enter_blood.ogg differ
diff --git a/sound/magic/exit_blood.ogg b/sound/magic/exit_blood.ogg
new file mode 100644
index 00000000000..c4399a2ecc6
Binary files /dev/null and b/sound/magic/exit_blood.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index e448e1b78bd..befe563aa7b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -381,6 +381,7 @@
#include "code\game\machinery\deployable.dm"
#include "code\game\machinery\door_control.dm"
#include "code\game\machinery\doppler_array.dm"
+#include "code\game\machinery\droneDispenser.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\Freezer.dm"
#include "code\game\machinery\hologram.dm"
@@ -433,7 +434,6 @@
#include "code\game\machinery\camera\motion.dm"
#include "code\game\machinery\camera\presets.dm"
#include "code\game\machinery\camera\tracking.dm"
-#include "code\game\machinery\computer\ai_core.dm"
#include "code\game\machinery\computer\aifixer.dm"
#include "code\game\machinery\computer\arcade.dm"
#include "code\game\machinery\computer\atmos_alert.dm"
@@ -553,6 +553,7 @@
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
+#include "code\game\objects\effects\spawners\structure.dm"
#include "code\game\objects\effects\spawners\vaultspawner.dm"
#include "code\game\objects\items\apc_frame.dm"
#include "code\game\objects\items\blueprints.dm"
@@ -570,6 +571,7 @@
#include "code\game\objects\items\devices\aicard.dm"
#include "code\game\objects\items\devices\camera_bug.dm"
#include "code\game\objects\items\devices\chameleonproj.dm"
+#include "code\game\objects\items\devices\doorCharge.dm"
#include "code\game\objects\items\devices\flash.dm"
#include "code\game\objects\items\devices\flashlight.dm"
#include "code\game\objects\items\devices\instruments.dm"
@@ -686,6 +688,7 @@
#include "code\game\objects\items\weapons\tanks\tank_types.dm"
#include "code\game\objects\items\weapons\tanks\tanks.dm"
#include "code\game\objects\items\weapons\tanks\watertank.dm"
+#include "code\game\objects\structures\ai_core.dm"
#include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
@@ -802,6 +805,7 @@
#include "code\modules\admin\newbanjob.dm"
#include "code\modules\admin\player_notes.dm"
#include "code\modules\admin\player_panel.dm"
+#include "code\modules\admin\secrets.dm"
#include "code\modules\admin\topic.dm"
#include "code\modules\admin\DB ban\functions.dm"
#include "code\modules\admin\permissionverbs\permissionedit.dm"
@@ -869,6 +873,7 @@
#include "code\modules\client\preferences.dm"
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_toggles.dm"
+#include "code\modules\clothing\cloaks.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\glasses.dm"
@@ -1242,6 +1247,8 @@
#include "code\modules\mob\living\simple_animal\revenant\revenant.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"
+#include "code\modules\mob\living\simple_animal\slaughter\slaughter.dm"
+#include "code\modules\mob\living\simple_animal\slaughter\slaughterevent.dm"
#include "code\modules\mob\living\simple_animal\slime\death.dm"
#include "code\modules\mob\living\simple_animal\slime\emote.dm"
#include "code\modules\mob\living\simple_animal\slime\life.dm"