diff --git a/code/modules/clothing/shoes/vg_shoes.dm b/code/modules/clothing/shoes/vg_shoes.dm index 931c25b823..627a061181 100644 --- a/code/modules/clothing/shoes/vg_shoes.dm +++ b/code/modules/clothing/shoes/vg_shoes.dm @@ -5,7 +5,6 @@ icon_state = "leather" item_color = "leather" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/magboots/deathsquad @@ -14,7 +13,6 @@ icon_state = "DS-magboots0" magboot_state = "DS-magboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF mutantrace_variation = NO_MUTANTRACE_VARIATION @@ -23,7 +21,6 @@ name = "atmospherics magboots" icon_state = "atmosmagboots0" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' magboot_state = "atmosmagboots" resistance_flags = FIRE_PROOF mutantrace_variation = NO_MUTANTRACE_VARIATION @@ -33,7 +30,6 @@ desc = "Simon's Shoes." icon_state = "simonshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/kneesocks @@ -41,7 +37,6 @@ desc = "A pair of girly knee-high socks." icon_state = "kneesock" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/jestershoes @@ -49,7 +44,6 @@ desc = "As worn by the clowns of old." icon_state = "jestershoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/aviatorboots @@ -57,7 +51,6 @@ desc = "Boots suitable for just about any occasion." icon_state = "aviator_boots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/libertyshoes @@ -65,7 +58,6 @@ desc = "Freedom isn't free, neither were these shoes." icon_state = "libertyshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/megaboots @@ -73,7 +65,6 @@ desc = "Large armored boots, very weak to large spikes." icon_state = "megaboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/protoboots @@ -81,7 +72,6 @@ desc = "Functionally identical to the DRN-001 model's boots, but in red." icon_state = "protoboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/megaxboots @@ -89,7 +79,6 @@ desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike." icon_state = "megaxboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/joeboots @@ -97,7 +86,6 @@ desc = "Nearly identical to the Prototype's boots, except in black." icon_state = "joeboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/doomguy @@ -105,7 +93,6 @@ desc = "If you look closely, you might see skull fragments still buried in these boots." icon_state = "doom" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/rottenshoes @@ -113,7 +100,6 @@ desc = "These shoes seem perfect for sneaking around." icon_state = "rottenshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/sandal/slippers @@ -121,7 +107,6 @@ icon_state = "slippers" desc = "For the wizard that puts comfort first. Who's going to laugh?" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/slippers_worn @@ -129,7 +114,6 @@ desc = "Fluffy..." icon_state = "slippers_worn" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/jackboots/neorussian @@ -137,5 +121,4 @@ desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit." icon_state = "nr_boots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION \ No newline at end of file diff --git a/modular_citadel/code/game/machinery/plasmacases.dm b/modular_citadel/code/game/machinery/plasmacases.dm deleted file mode 100644 index c45eb48caa..0000000000 --- a/modular_citadel/code/game/machinery/plasmacases.dm +++ /dev/null @@ -1,24 +0,0 @@ -/obj/structure/guncase/plasma - name = "plasma rifle locker" - desc = "A locker that holds plasma rifles. Only opens in dire emergencies." - icon_state = "ecase" - case_type = "egun" - gun_category = /obj/item/gun/energy/plasma - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //because fuck you, powergaming nerds. - -/obj/structure/guncase/plasma/attackby(obj/item/W, mob/user, params) - return - -/obj/structure/guncase/plasma/MouseDrop(over_object, src_location, over_location) - if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA) - . = ..() - else - to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.") - -/obj/structure/guncase/plasma/attack_hand(mob/user) - return MouseDrop(user) - -/obj/structure/guncase/plasma/emag_act() - . = SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT) - if(!.) - to_chat(usr, "The locking mechanism is fitted with old style parts, The card has no effect.") \ No newline at end of file diff --git a/modular_citadel/code/game/objects/items/devices/genemods.dm b/modular_citadel/code/game/objects/items/devices/genemods.dm deleted file mode 100644 index 5efebf4860..0000000000 --- a/modular_citadel/code/game/objects/items/devices/genemods.dm +++ /dev/null @@ -1,21 +0,0 @@ -//Will include consumable gene mods in the future. - -/obj/item/genemod - name = "genetic modifier" - desc = "Microbodies which can grow, morph, or otherwise change an organism into something else." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "dnainjector" - throw_speed = 3 - throw_range = 5 - w_class = WEIGHT_CLASS_TINY - var/applied_region = "chest" - var/list/add_mutations = list() - var/list/remove_mutations = list() - - var/list/add_mutations_static = list() - var/list/remove_mutations_static = list() - - var/used = 0 - -/obj/item/genemod/proc/use(mob/living/carbon/human/target) - return \ No newline at end of file diff --git a/modular_citadel/code/modules/antagonists/cit_crewobjectives.dm b/modular_citadel/code/modules/antagonists/cit_crewobjectives.dm deleted file mode 100644 index 6afa92af65..0000000000 --- a/modular_citadel/code/modules/antagonists/cit_crewobjectives.dm +++ /dev/null @@ -1,35 +0,0 @@ -/datum/controller/subsystem/ticker/proc/generate_crew_objectives() - for(var/datum/mind/crewMind in SSticker.minds) - if(prob(5) && !issilicon(crewMind.current) && !jobban_isbanned(crewMind, "Syndicate") && GLOB.miscreants_allowed && ROLE_MISCREANT in crewMind.current.client.prefs.be_special) - generate_miscreant_objectives(crewMind) - else - if(CONFIG_GET(flag/allow_crew_objectives)) - generate_individual_objectives(crewMind) - return - -/datum/controller/subsystem/ticker/proc/generate_individual_objectives(var/datum/mind/crewMind) - if(!(CONFIG_GET(flag/allow_crew_objectives))) - return - if(!crewMind) - return - if(!crewMind.current || !crewMind.objectives || crewMind.special_role) - return - if(!crewMind.assigned_role) - return - var/list/validobjs = crewobjjobs["[ckey(crewMind.assigned_role)]"] - if(!validobjs || !validobjs.len) - return - var/selectedObj = pick(validobjs) - var/datum/objective/crew/newObjective = new selectedObj - if(!newObjective) - return - newObjective.owner = crewMind - crewMind.objectives += newObjective - to_chat(crewMind, "As a part of Nanotrasen's anti-tide efforts, you have been assigned an optional objective. It will be checked at the end of the shift. Performing traitorous acts in pursuit of your objective may result in termination of your employment.") - to_chat(crewMind, "Your optional objective: [newObjective.explanation_text]") - -/datum/objective/crew/ - var/jobs = "" - explanation_text = "Yell on the development discussion channel on Citadels discord if this ever shows up. Something just broke here, dude" - -/datum/objective/crew/proc/setup() diff --git a/modular_citadel/code/modules/antagonists/cit_miscreants.dm b/modular_citadel/code/modules/antagonists/cit_miscreants.dm deleted file mode 100644 index 5726167820..0000000000 --- a/modular_citadel/code/modules/antagonists/cit_miscreants.dm +++ /dev/null @@ -1,52 +0,0 @@ -/datum/controller/subsystem/ticker/proc/generate_miscreant_objectives(var/datum/mind/crewMind) - if(!GLOB.miscreants_allowed) - return - if(!crewMind) - return - if(!crewMind.current || !crewMind.objectives || crewMind.special_role) - return - if(!crewMind.assigned_role) - return - if(!(ROLE_MISCREANT in crewMind.current.client.prefs.be_special)) - return - if(jobban_isbanned(crewMind, "Syndicate")) - return - var/list/objectiveTypes = miscreantobjlist - if(!objectiveTypes.len) - return - var/selectedType = pick(objectiveTypes) - var/datum/objective/miscreant/newObjective = new selectedType - if(!newObjective) - return - newObjective.owner = crewMind - crewMind.objectives += newObjective - crewMind.special_role = "miscreant" - to_chat(crewMind, "You are a Miscreant.") - to_chat(crewMind, "Pursuing your objective is entirely optional, as the completion of your objective is unable to be tracked. Performing traitorous acts not directly related to your objective may result in permanent termination of your employment.") - to_chat(crewMind, "Your objective: [newObjective.explanation_text]") - -/datum/objective/miscreant - explanation_text = "Something broke. Horribly. Dear god, im so sorry. Yell about this in the development discussion channel of citadels discord." - -/* Goon's Miscreant Objectives */ - - -/datum/objective/miscreant/incompetent - explanation_text = "Be as useless and incompetent as possible without getting killed." - -/datum/objective/miscreant/litterbug - explanation_text = "Make a huge mess wherever you go." - -/datum/objective/miscreant/creepy - explanation_text = "Sneak around looking as suspicious as possible without actually doing anything illegal." - -/datum/objective/miscreant/whiny - explanation_text = "Complain incessantly about every minor issue you find." - -/* Citadel's Miscreant Objectives */ - -/datum/objective/miscreant/immersions - explanation_text = "Act as uncharacteristic as you possibly can." // corrected from "Act as out of character as you can" people thought it meant to just ooc in ic - -/datum/objective/miscreant/cargonia - explanation_text = "Attempt to establish independence of your department." diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_cargo.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_cargo.dm deleted file mode 100644 index 010337b49f..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_cargo.dm +++ /dev/null @@ -1,81 +0,0 @@ -/* CARGO OBJECTIVES */ - -/datum/objective/crew/petsplosion - explanation_text = "Ensure there are at least (If you see this, yell on citadels discord in the development discussion channel) pets on the station by the end of the shift. Interpret this as you wish." - jobs = "quartermaster,cargotechnician" - -/datum/objective/crew/petsplosion/New() - . = ..() - target_amount = rand(10,30) - update_explanation_text() - -/datum/objective/crew/petsplosion/update_explanation_text() - . = ..() - explanation_text = "Ensure there are at least [target_amount] pets on the station by the end of the shift. Interpret this as you wish." - -/datum/objective/crew/petsplosion/check_completion() - var/petcount = target_amount - for(var/mob/living/simple_animal/pet/P in GLOB.mob_list) - if(!(P.stat == DEAD)) - if(P.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(P)]) - petcount-- - for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(!(H.stat == DEAD)) - if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) - if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) - petcount-- - if(petcount <= 0) - return TRUE - else - return FALSE - -/datum/objective/crew/points //ported from old hippie - explanation_text = "Make sure the station has at least (Something broke, report this to the development discussion channel of citadels discord) supply points at the end of the shift." - jobs = "quartermaster,cargotechnician" - -/datum/objective/crew/points/New() - . = ..() - target_amount = rand(25000,100000) - update_explanation_text() - -/datum/objective/crew/points/update_explanation_text() - . = ..() - explanation_text = "Make sure the station has at least [target_amount] supply points at the end of the shift." - -/datum/objective/crew/points/check_completion() - if(SSshuttle.points >= target_amount) - return TRUE - else - return FALSE - -/datum/objective/crew/bubblegum - explanation_text = "Ensure Bubblegum is dead at the end of the shift." - jobs = "shaftminer" - -/datum/objective/crew/bubblegum/check_completion() - for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list) - if(!(B.stat == DEAD)) - return FALSE - return TRUE - -/datum/objective/crew/fatstacks //ported from old hippie - explanation_text = "Have at least (something broke, report this to the development discussion channel of citadels discord) mining points on your ID at the end of the shift." - jobs = "shaftminer" - -/datum/objective/crew/fatstacks/New() - . = ..() - target_amount = rand(15000,50000) - update_explanation_text() - -/datum/objective/crew/fatstacks/update_explanation_text() - . = ..() - explanation_text = "Have at least [target_amount] mining points on your ID at the end of the shift." - -/datum/objective/crew/fatstacks/check_completion() - if(owner && owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(theID.mining_points >= target_amount) - return TRUE - return FALSE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm deleted file mode 100644 index 491285e9c4..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm +++ /dev/null @@ -1,249 +0,0 @@ -/* CIVILIAN OBJECTIVES */ - -/datum/objective/crew/druglordbot //ported from old Hippie with adjustments - var/targetchem = "none" - var/datum/reagent/chempath - explanation_text = "Have at least (somethin broke here) harvested plants containing (report this on the development discussion channel of citadel's discord) when the shift ends." - jobs = "botanist" - -/datum/objective/crew/druglordbot/New() - . = ..() - target_amount = rand(3,20) - var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste) - var/drugs = typesof(/datum/reagent/drug) - blacklist - var/meds = typesof(/datum/reagent/medicine) - blacklist - var/chemlist = drugs + meds - chempath = pick(chemlist) - targetchem = initial(chempath.id) - update_explanation_text() - -/datum/objective/crew/druglordbot/update_explanation_text() - . = ..() - explanation_text = "Have at least [target_amount] harvested plants containing [initial(chempath.name)] when the shift ends." - -/datum/objective/crew/druglordbot/check_completion() - var/pillcount = target_amount - if(owner && owner.current) - if(owner.current.contents) - for(var/obj/item/reagent_containers/food/snacks/grown/P in owner.current.get_contents()) - if(P.reagents.has_reagent(targetchem)) - pillcount-- - if(pillcount <= 0) - return TRUE - else - return FALSE - -/datum/objective/crew/foodhoard - var/datum/crafting_recipe/food/targetfood - var/obj/item/reagent_containers/food/foodpath - explanation_text = "Personally deliver at least (yo something broke) (report this to the developer discussion channel in citadels discord)s to Centcom." - jobs = "cook" - -/datum/objective/crew/foodhoard/New() - . = ..() - target_amount = rand(2,10) - var/blacklist = list(/datum/crafting_recipe/food, /datum/crafting_recipe/food/cak) - var/possiblefoods = typesof(/datum/crafting_recipe/food) - blacklist - targetfood = pick(possiblefoods) - foodpath = initial(targetfood.result) - update_explanation_text() - -/datum/objective/crew/foodhoard/update_explanation_text() - . = ..() - explanation_text = "Personally deliver at least [target_amount] [initial(foodpath.name)]s to Centcom." - -/datum/objective/crew/foodhoard/check_completion() - if(owner && owner.current && owner.current.check_contents_for(foodpath) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return TRUE - else - return FALSE - -/datum/objective/crew/responsibility - explanation_text = "Make sure nobody dies with alcohol poisoning." - jobs = "bartender" - -/datum/objective/crew/responsibility/check_completion() - for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(H.stat == DEAD && H.drunkenness >= 80) - if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) - return FALSE - return TRUE - -/datum/objective/crew/clean //ported from old Hippie - var/list/areas = list() - var/hardmode = FALSE - explanation_text = "Ensure sure that (Yo, something broke. Yell about this in citadels devlopmeent discussion channel.) remain spotless at the end of the shift." - jobs = "janitor" - -/datum/objective/crew/clean/New() - . = ..() - if(prob(1)) - hardmode = TRUE - var/list/blacklistnormal = list(typesof(/area/space) - typesof(/area/lavaland) - typesof(/area/mine) - typesof(/area/ai_monitored/turret_protected) - typesof(/area/tcommsat)) - var/list/blacklisthard = list(typesof(/area/lavaland) - typesof(/area/mine)) - var/list/possibleareas = list() - if(hardmode) - possibleareas = GLOB.teleportlocs - /area - blacklisthard - else - possibleareas = GLOB.teleportlocs - /area - blacklistnormal - for(var/i in 1 to rand(1,6)) - areas |= pick_n_take(possibleareas) - update_explanation_text() - -/datum/objective/crew/clean/update_explanation_text() - . = ..() - explanation_text = "Ensure that the" - for(var/i in 1 to areas.len) - var/area/A = areas[i] - explanation_text += " [A]" - if(i != areas.len && areas.len >= 3) - explanation_text += "," - if(i == areas.len - 1) - explanation_text += "and" - explanation_text += " [(areas.len ==1) ? "is completely" : "are [(areas.len == 2) ? "completely" : "all"]"] clean at the end of the shift." - if(hardmode) - explanation_text += " Chop-chop." - -/datum/objective/crew/clean/check_completion() - for(var/area/A in areas) - for(var/obj/effect/decal/cleanable/C in area_contents(A)) - if(C && C.alpha >= 150) - return FALSE - return TRUE - -/datum/objective/crew/slipster //ported from old Hippie with adjustments - explanation_text = "Slip at least (Yell on citadel's development discussion channel if you see this) different people with your PDA, and have it on you at the end of the shift." - jobs = "clown" - -/datum/objective/crew/slipster/New() - . = ..() - target_amount = rand(5, 20) - update_explanation_text() - -/datum/objective/crew/slipster/update_explanation_text() - . = ..() - explanation_text = "Slip at least [target_amount] different people with your PDA, and have it on you at the end of the shift." - -/datum/objective/crew/slipster/check_completion() - var/list/uniqueslips = list() - if(owner && owner.current) - for(var/obj/item/pda/clown/PDA in owner.current.get_contents()) - for(var/mob/living/carbon/human/H in PDA.slipvictims) - uniqueslips |= H - if(uniqueslips.len >= target_amount) - return TRUE - else - return FALSE - -/datum/objective/crew/vow //ported from old Hippie - explanation_text = "Never break your vow of silence." - jobs = "mime" - -/datum/objective/crew/vow/check_completion() - if(owner && owner.current) - var/list/say_log = owner.current.logging[INDIVIDUAL_SAY_LOG] - if(say_log.len > 0) - return FALSE - return TRUE - -/datum/objective/crew/nullrod - explanation_text = "Don't lose your holy rod." - jobs = "chaplain" - -/datum/objective/crew/nullrod/check_completion() - if(owner && owner.current) - for(var/nullrodtypes in typesof(/obj/item/nullrod)) - if(owner.current.check_contents_for(nullrodtypes)) - return TRUE - if(owner.current.getorgan(/obj/item/organ/genital/penis)) - return TRUE - return FALSE - -/datum/objective/crew/reporter //ported from old hippie - var/charcount = 100 - explanation_text = "Publish at least (Yo something broke) articles containing at least (Report this to Citadels development channel) characters." - jobs = "curator" - -/datum/objective/crew/reporter/New() - . = ..() - target_amount = rand(2,10) - charcount = rand(20,250) - update_explanation_text() - -/datum/objective/crew/reporter/update_explanation_text() - . = ..() - explanation_text = "Publish at least [target_amount] articles containing at least [charcount] characters." - -/datum/objective/crew/reporter/check_completion() - if(owner && owner.current) - var/ownername = "[ckey(owner.current.real_name)][ckey(owner.assigned_role)]" - for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels) - for(var/datum/newscaster/feed_message/msg in chan.messages) - if(ckey(msg.returnAuthor()) == ckey(ownername)) - if(length(msg.returnBody()) >= charcount) - target_amount-- - if(target_amount <= 0) - return TRUE - else - return FALSE - -/datum/objective/crew/pwrgame //ported from Goon with adjustments - var/obj/item/clothing/targettidegarb - explanation_text = "Get your grubby hands on a (Dear god something broke. Report this to Citadel's development dicussion channel)." - jobs = "assistant" - -/datum/objective/crew/pwrgame/New() - . = ..() - var/list/muhvalids = list(/obj/item/clothing/mask/gas, /obj/item/clothing/head/welding, /obj/item/clothing/head/ushanka, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/mask/gas/owl_mask) - if(prob(10)) - muhvalids += list(/obj/item/clothing/suit/space) - targettidegarb = pick(muhvalids) - update_explanation_text() - -/datum/objective/crew/pwrgame/update_explanation_text() - . = ..() - explanation_text = "Get your grubby hands on a [initial(targettidegarb.name)]." -/* DM is not a sane language in any way, shape, or form. If anyone wants to try to get this bit functioning proper, I hold no responsibility for broken keyboards. - if(owner && owner.current) - var/mob/living/carbon/human/H = owner.current - if(H && H.dna && H.dna.species && H.dna.species.id) - explanation_text = "Get your " - if(H.dna.species.id == "avian") - explanation_text += "scratchy claws " - else if(H.dna.species.id == "mammal") - explanation_text += "dirty paws " - else if(H.dna.species.id == "aquatic") - explanation_text += "fishy hands " - else if(H.dna.species.id == "xeno") - explanation_text += "weird claws " - else if(H.dna.species.id == "guilmon") - explanation_text += "digital claws " - else if(H.dna.species.id == "lizard") - explanation_text += "slimy claws " - else if(H.dna.species.id == "datashark") - explanation_text += "glitchy hands " - else if(H.dna.species.id == "insect") - explanation_text += "gross grabbers " - else - explanation_text += "grubby hands " - explanation_text += "on a space suit." replace this if you're making this monstrosity work */ - -/datum/objective/crew/pwrgame/check_completion() - if(owner && owner.current) - for(var/tidegarbtypes in typesof(targettidegarb)) - if(owner.current.check_contents_for(tidegarbtypes)) - return TRUE - return FALSE - -/datum/objective/crew/promotion //ported from Goon - explanation_text = "Have a non-assistant ID registered to you at the end of the shift." - jobs = "assistant" - -/datum/objective/crew/promotion/check_completion() - if(owner && owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(!(H.get_assignment() == "Assistant") && !(H.get_assignment() == "No id") && !(H.get_assignment() == "No job")) - return TRUE - return FALSE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_command.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_command.dm deleted file mode 100644 index f01c887c9f..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_command.dm +++ /dev/null @@ -1,33 +0,0 @@ -/* COMMAND OBJECTIVES */ - -/datum/objective/crew/caphat //Ported from Goon - explanation_text = "Don't lose your hat." - jobs = "captain" - -/datum/objective/crew/caphat/check_completion() - if(owner && owner.current && owner.current.check_contents_for(/obj/item/clothing/head/caphat)) - return TRUE - else - return FALSE - -/datum/objective/crew/datfukkendisk //Ported from old Hippie - explanation_text = "Defend the nuclear authentication disk at all costs, and be the one to personally deliver it to Centcom." - jobs = "captain" //give this to other heads at your own risk. - -/datum/objective/crew/datfukkendisk/check_completion() - if(owner && owner.current && owner.current.check_contents_for(/obj/item/disk/nuclear) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return TRUE - else - return FALSE - -/datum/objective/crew/ian //Ported from old Hippie - explanation_text = "Defend Ian at all costs, and ensure he gets delivered to Centcom at the end of the shift." - jobs = "headofpersonnel" - -/datum/objective/crew/ian/check_completion() - if(owner && owner.current) - for(var/mob/living/simple_animal/pet/dog/corgi/Ian/goodboy in GLOB.mob_list) - if(goodboy.stat != DEAD && SSshuttle.emergency.shuttle_areas[get_area(goodboy)]) - return TRUE - return FALSE - return FALSE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm deleted file mode 100644 index 44d961e9c3..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm +++ /dev/null @@ -1,34 +0,0 @@ -/* ENGINEERING OBJECTIVES */ - -/datum/objective/crew/integrity //ported from old Hippie - explanation_text = "Ensure the station's integrity rating is at least (Yo something broke, yell on the development discussion channel of citadels discord about this)% when the shift ends." - jobs = "chiefengineer,stationengineer" - -/datum/objective/crew/integrity/New() - . = ..() - target_amount = rand(60,95) - update_explanation_text() - -/datum/objective/crew/integrity/update_explanation_text() - . = ..() - explanation_text = "Ensure the station's integrity rating is at least [target_amount]% when the shift ends." - -/datum/objective/crew/integrity/check_completion() - var/datum/station_state/end_state = new /datum/station_state() - end_state.count() - var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) - if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount) - return TRUE - else - return FALSE - -/datum/objective/crew/poly - explanation_text = "Make sure Poly keeps his headset, and stays alive until the end of the shift." - jobs = "chiefengineer" - -/datum/objective/crew/poly/check_completion() - for(var/mob/living/simple_animal/parrot/Poly/dumbbird in GLOB.mob_list) - if(!(dumbbird.stat == DEAD) && dumbbird.ears) - if(istype(dumbbird.ears, /obj/item/radio/headset)) - return TRUE - return FALSE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_medical.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_medical.dm deleted file mode 100644 index aad6e95df4..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_medical.dm +++ /dev/null @@ -1,86 +0,0 @@ -/* MEDICAL OBJECTIVES */ - -/datum/objective/crew/morgue //Ported from old Hippie - explanation_text = "Ensure there are no corpses on the station outside of the morgue when the shift ends." - jobs = "chiefmedicalofficer,geneticist,medicaldoctor" - -/datum/objective/crew/morgue/check_completion() - for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(H.stat == DEAD && H.z == SSmapping.station_start) - if(get_area(H) != /area/medical/morgue) - return FALSE - return TRUE - -/datum/objective/crew/chems //Ported from old Hippie - var/targetchem = "none" - var/datum/reagent/chempath - explanation_text = "Have (yell about this in the development discussion channel of citadel's discord, something broke) in your bloodstream when the shift ends." - jobs = "chiefmedicalofficer,chemist" - -/datum/objective/crew/chems/New() - . = ..() - var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste) - var/drugs = typesof(/datum/reagent/drug) - blacklist - var/meds = typesof(/datum/reagent/medicine) - blacklist - var/chemlist = drugs + meds - chempath = pick(chemlist) - targetchem = initial(chempath.id) - update_explanation_text() - -/datum/objective/crew/chems/update_explanation_text() - . = ..() - explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends." - -/datum/objective/crew/chems/check_completion() - if(owner.current) - if(!owner.current.stat == DEAD && owner.current.reagents) - if(owner.current.reagents.has_reagent(targetchem)) - return TRUE - else - return FALSE - -/datum/objective/crew/druglordchem //ported from old Hippie with adjustments - var/targetchem = "none" - var/datum/reagent/chempath - var/chemamount = 0 - explanation_text = "Have at least (somethin broke here) pills containing at least (like really broke) units of(report this on the development discussion channel of citadel's discord) when the shift ends." - jobs = "chemist" - -/datum/objective/crew/druglordchem/New() - . = ..() - target_amount = rand(5,50) - chemamount = rand(1,20) - var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol) - var/drugs = typesof(/datum/reagent/drug) - blacklist - var/chemlist = drugs - chempath = pick(chemlist) - targetchem = initial(chempath.id) - update_explanation_text() - -/datum/objective/crew/druglordchem/update_explanation_text() - . = ..() - explanation_text = "Have at least [target_amount] pills containing at least [chemamount] units of [initial(chempath.name)] when the shift ends." - -/datum/objective/crew/druglordchem/check_completion() - var/pillcount = target_amount - if(owner.current) - if(owner.current.contents) - for(var/obj/item/reagent_containers/pill/P in owner.current.get_contents()) - if(P.reagents.has_reagent(targetchem, chemamount)) - pillcount-- - if(pillcount <= 0) - return TRUE - else - return FALSE - -/datum/objective/crew/noinfections - explanation_text = "Make sure there are no crew members with harmful diseases at the end of the shift." - jobs = "virologist" - -/datum/objective/crew/noinfections/check_completion() - for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(!H.stat == DEAD) - if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) - if(H.check_virus() == 2) - return FALSE - return TRUE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_science.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_science.dm deleted file mode 100644 index fb260583fd..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_science.dm +++ /dev/null @@ -1,45 +0,0 @@ -/* SCIENCE OBJECTIVES */ - -/datum/objective/crew/cyborgs //Ported from old Hippie - explanation_text = "Ensure there are at least (Yo something broke here, yell on citadel's development discussion channel about this) functioning cyborgs when the shift ends." - jobs = "researchdirector,roboticist" - -/datum/objective/crew/cyborgs/New() - . = ..() - target_amount = rand(3,10) - update_explanation_text() - -/datum/objective/crew/cyborgs/update_explanation_text() - . = ..() - explanation_text = "Ensure there are at least [target_amount] functioning cyborgs when the shift ends." - -/datum/objective/crew/cyborgs/check_completion() - var/borgcount = target_amount - for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list) - if(!(R.stat == DEAD)) - borgcount-- - if(borgcount <= 0) - return TRUE - else - return FALSE - -/datum/objective/crew/research //inspired by old hippie's research level objective. should hopefully be compatible with techwebs when that gets finished. hopefully. should be easy to update in the event that it is incompatible with techwebs. - var/datum/design/targetdesign - explanation_text = "Make sure the research required to produce a (something broke, yell on citadel's development discussion channel about this) is available on the R&D server by the end of the shift." - jobs = "researchdirector,scientist" - -/datum/objective/crew/research/New() - . = ..() - targetdesign = pick(subtypesof(/datum/design)) - update_explanation_text() - -/datum/objective/crew/research/update_explanation_text() - . = ..() - explanation_text = "Make sure the research required to produce a [initial(targetdesign.name)] is available on the R&D server by the end of the shift." - -/datum/objective/crew/research/check_completion() - for(var/obj/machinery/rnd/server/S in GLOB.machines) - if(S && S.stored_research) - if(S.stored_research.researched_designs[initial(targetdesign.id)]) - return TRUE - return FALSE diff --git a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_security.dm b/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_security.dm deleted file mode 100644 index 8906c268d2..0000000000 --- a/modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_security.dm +++ /dev/null @@ -1,23 +0,0 @@ -/* SECURITY OBJECTIVES */ - -/datum/objective/crew/enjoyyourstay - explanation_text = "Enforce Space Law to the best of your ability." - jobs = "headofsecurity,securityofficer,warden,detective" - -/datum/objective/crew/enjoyyourstay/check_completion() - if(owner && owner.current) - if(owner.current.stat != DEAD) - return TRUE - return FALSE - -/datum/objective/crew/justicecrew - explanation_text = "Ensure there are no innocent crew members in the brig when the shift ends." - jobs = "lawyer" - -/datum/objective/crew/justicecrew/check_completion() - if(owner && owner.current) - for(var/datum/mind/M in SSticker.minds) - if(M.current && isliving(M.current)) - if(!M.special_role && !(M.assigned_role == "Security Officer") && !(M.assigned_role == "Detective") && !(M.assigned_role == "Head of Security") && !(M.assigned_role == "Lawyer") && !(M.assigned_role == "Warden") && get_area(M.current) != typesof(/area/security)) - return FALSE - return TRUE diff --git a/modular_citadel/code/modules/cargo/packs.dm b/modular_citadel/code/modules/cargo/packs.dm deleted file mode 100644 index 6d39a51a76..0000000000 --- a/modular_citadel/code/modules/cargo/packs.dm +++ /dev/null @@ -1,28 +0,0 @@ -//supply packs - -/datum/supply_pack/misc/kinkmate - name = "Kinkmate construction kit" - cost = 2000 - contraband = TRUE - contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate) - crate_name = "Kinkmate construction kit" - - -//Food and livestocks - -/datum/supply_pack/organic/critter/kiwi - name = "Space kiwi Crate" - cost = 2000 - contains = list( /mob/living/simple_animal/kiwi) - crate_name = "space kiwi crate" - - -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Miscellaneous /////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -/datum/supply_pack/misc/jukebox - name = "Jukebox" - cost = 35000 - contains = list(/obj/machinery/jukebox) - crate_name = "Jukebox" diff --git a/modular_citadel/code/modules/crafting/recipes.dm b/modular_citadel/code/modules/crafting/recipes.dm deleted file mode 100644 index 6c6001b040..0000000000 --- a/modular_citadel/code/modules/crafting/recipes.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/crafting_recipe/toyneb - name = "Non-Euplastic Blade" - reqs = list(/obj/item/light/tube = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4) - result = /obj/item/toy/sword/cx - category = CAT_MISC - -/datum/crafting_recipe/potatos - name = "Potat-OS" - reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/aicard = 1 ) - result = /obj/item/aicard/potato - category = CAT_ROBOT \ No newline at end of file diff --git a/modular_citadel/code/modules/mining/mine_items.dm b/modular_citadel/code/modules/mining/mine_items.dm deleted file mode 100644 index d2cd1f2aa3..0000000000 --- a/modular_citadel/code/modules/mining/mine_items.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/computer/shuttle/mining - req_access = list(ACCESS_MINING) \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/living/simple_animal/pokemon.dm b/modular_citadel/code/modules/mob/living/simple_animal/pokemon.dm deleted file mode 100644 index c3514719f6..0000000000 --- a/modular_citadel/code/modules/mob/living/simple_animal/pokemon.dm +++ /dev/null @@ -1,306 +0,0 @@ -//Sprites are trademarks of Gamefreak, Nintendo, The Pokemon Company, and Spike Chunsoft. -#define ispokemon(A) (istype(A, /mob/living/simple_animal/pokemon)) -//POKEBALL -/obj/item/pokeball - name = "pokeball" - icon = 'icons/obj/pokeball.dmi' - icon_state = "pokeball" - force = 0 - throwforce = 0 - var/success_chance = 25 - var/pokemon -/obj/item/pokeball/great - name = "great ball" - icon_state = "pokeball_great" - success_chance = 50 -/obj/item/pokeball/ultra - icon_state = "pokeball_ultra" - name = "ultra ball" - success_chance = 75 -/obj/item/pokeball/master - icon_state = "pokeball_master" - name = "master ball" - success_chance = 100 -/* //WIP -/obj/item/pokeball/throw_impact(atom/hit_atom) - if(ispokemon(hit_atom)) - var/mob/living/simple_animal/pokemon/pmon = hit_atom - var/initial_success_chance = success_chance - pmon.resize = 0.1 - pmon.color = "RED" - pmon.canmove = 0 - sleep(15) - if(pmon.pokeball == src) - pmon.loc = src - pokemon = pmon - - return 1 - if(pmon.pokeball && pmon.pokeball !=src) - return ..() - var/bonus_chance = ((pmon.maxHealth - pmon.health) / 2) - if(bonus_chance > 100) - bonus_chance = 100 - success_chance = (success_chance + bonus_chance) - if(success_chance > 100) - success_chance = 100 - if(success_chance < 0)//just in case - success_chance = 0 - sleep(15) - if(prob(success_chance)) - visible_message("[src] shakes...") - else - escape() - sleep(15) - if(prob(success_chance)) - visible_message("[src] shakes...") - else - escape() - sleep(15) - if(prob(success_chance)) - visible_message("[src] shakes...") - else - escape() - else - ..() -/obj/item/pokeball/proc/capture(mob/living/simple_animal/pokemon/pmon, mob/living/user) - -/obj/item/pokeball/proc/escape(mob/living/simple_animal/pokemon/pmon, mob/living/user) - if(!pokemon) - return - pmon.resize = 10 - pmon.color = null - pmon.canmove = 1 - pmon.loc = src.loc - if(pmon.pokeball != src) - visible_message("[pmon] breaks free from [src]") - PoolOrNew(/obj/effect/particle_effect/sparks, loc) - playsound(src.loc, "sparks", 50, 1) - qdel(src) - - else -/obj/item/pokeball/proc/recall -/obj/item/pokeball/proc/release -*/ -/mob/living/simple_animal/pokemon - name = "eevee" - icon_state = "eevee" - icon_living = "eevee" - icon_dead = "eevee_d" - desc = "Gotta catch 'em all!" - icon = 'icons/mob/pokemon.dmi' - var/pokeball - pixel_x = -16 - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5) - ventcrawler = 2 - health = 100 - maxHealth = 100 - layer = 4 - response_help = "pets" - wander = 1 - turns_per_move = 2 - pass_flags = PASSTABLE | PASSMOB - -/mob/living/simple_animal/pokemon/proc/simple_lay_down() - set name = "Rest" - set category = "IC" - - resting = !resting - src << "You are now [resting ? "resting" : "getting up"]." - update_canmove() - update_icon() - -/mob/living/simple_animal/pokemon/proc/update_icon() - if(lying || resting || sleeping) - icon_state = "[icon_state]_rest" - else - icon_state = "[icon_living]" - -/mob/living/simple_animal/pokemon/New() - ..() - verbs += /mob/living/simple_animal/pokemon/proc/simple_lay_down - -/* -/////TEMPLATE///// - -/mob/living/simple_animal/pokemon/ - name = "" - icon_state = "" - icon_living = "" - icon_dead = "" -*/ - -/mob/living/simple_animal/pokemon/leg - icon = 'icons/mob/legendary.dmi' - pixel_x = -32 - butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 12) - health = 200 - maxHealth = 200 - - -/mob/living/simple_animal/pokemon/leg/articuno - name = "Articuno" - icon_state = "articuno" - icon_living = "articuno" - icon_dead = "articuno_d" - flying = 1 - -/mob/living/simple_animal/pokemon/leg/rayquaza - name = "Rayquaza" - icon_state = "rayquaza" - icon_living = "rayquaza" - icon_dead = "rayquaza_d" - flying = 1 - -//ALPHABETICAL PLEASE - -/mob/living/simple_animal/pokemon/absol - name = "absol" - icon_state = "absol" - icon_living = "absol" - icon_dead = "absol_d" - speak = list("Absol!", "Ab-Absol!") - -/mob/living/simple_animal/pokemon/aggron - name = "aggron" - icon_state = "aggron" - icon_living = "aggron" - icon_dead = "aggron_d" - -/mob/living/simple_animal/pokemon/ampharos - name = "ampharos" - icon_state = "ampharos" - icon_living = "ampharos" - icon_dead = "ampharos_d" - -/mob/living/simple_animal/pokemon/charmander - name = "charmander" - icon_state = "charmander" - icon_living = "charmander" - icon_dead = "charmander_d" - -/mob/living/simple_animal/pokemon/ditto - name = "ditto" - icon_state = "ditto" - icon_living = "ditto" - icon_dead = "ditto_d" - -/mob/living/simple_animal/pokemon/dratini/dragonair - name = "dragonair" - desc = "A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail." - icon_state = "dragonair" - icon_living = "dragonair" - icon_dead = "dragonair_d" - -/mob/living/simple_animal/pokemon/dratini/dragonair/dragonite - name = "dragonite" - desc = "It can circle the globe in just 16 hours. It is a kindhearted Pokémon that leads lost and foundering ships in a storm to the safety of land." - icon_state = "dragonite" - icon_living = "dragonite" - icon_dead = "dragonite_d" - -/mob/living/simple_animal/pokemon/dratini - name = "dratini" - desc = "A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels." - icon_state = "dratini" - icon_living = "dratini" - icon_dead = "dratini_d" - -/mob/living/simple_animal/pokemon/eevee - name = "eevee" - desc = "Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve." - icon_state = "eevee" - icon_living = "eevee" - icon_dead = "eevee_d" - speak = list("Eevee!", "Ee-Eevee!") - response_help = "pets" - response_harm = "hits" - -/mob/living/simple_animal/pokemon/eevee/espeon - name = "espeon" - desc = "Espeon is extremely loyal to any trainer it considers to be worthy. It is said to have developed precognitive powers to protect its trainer from harm." - icon_state = "espeon" - icon_living = "espeon" - icon_dead = "espeon_d" - -/mob/living/simple_animal/pokemon/flaaffy - name = "flaaffy" - icon_state = "flaaffy" - icon_living = "flaaffy" - icon_dead = "flaaffy_d" - -/mob/living/simple_animal/pokemon/eevee/flareon - name = "flareon" - desc = "Flareon's fluffy fur releases heat into the air so that its body does not get excessively hot. Its body temperature can rise to a maximum of 1,650 degrees F." - icon_state = "flareon" - icon_living = "flareon" - icon_dead = "flareon_d" - speak = list("Flare!", "Flareon!") - -/mob/living/simple_animal/pokemon/eevee/glaceon - name = "glaceon" - desc = "By controlling its body heat, it can freeze the atmosphere around it to make a diamond-dust flurry." - icon_state = "glaceon" - icon_living = "glaceon" - icon_dead = "glaceon_d" - speak = list("Glace!", "Glaceon!") - -/mob/living/simple_animal/pokemon/eevee/jolteon - name = "jolteon" - desc = "Its cells generate weak power that is amplified by its fur's static electricity to drop thunderbolts. The bristling fur is made of electrically charged needles." - icon_state = "jolteon" - icon_living = "jolteon" - icon_dead = "jolteon_d" - speak = list("Jolt!", "Jolteon!") - -/mob/living/simple_animal/pokemon/larvitar - name = "larvitar" - desc = "It is born deep underground. It can't emerge until it has entirely consumed the soil around it." - icon_state = "larvitar" - icon_living = "larvitar" - icon_dead = "larvitar_d" - -/mob/living/simple_animal/pokemon/mareep - name = "mareep" - icon_state = "mareep" - icon_living = "mareep" - icon_dead = "mareep_d" - -/mob/living/simple_animal/pokemon/poochyena/mightyena - name = "mightyena" - icon_state = "mightyena" - icon_living = "mightyena" - icon_dead = "mightyena" - -/mob/living/simple_animal/pokemon/miltank - name = "miltank" - icon_state = "miltank" - icon_living = "miltank" - icon_dead = "miltank_d" - -/mob/living/simple_animal/pokemon/poochyena - name = "poochyena" - icon_state = "poochyena" - icon_living = "poochyena" - icon_dead = "poochyena_d" - -/mob/living/simple_animal/pokemon/eevee/sylveon - name = "Sylveon" - desc = "Sylveon, the Intertwining Pokémon. Sylveon affectionately wraps its ribbon-like feelers around its Trainer's arm as they walk together." - icon_state = "sylveon" - icon_living = "sylveon" - icon_dead = "sylveon_d" - speak = list("Sylveon!", "Syl!") - response_help = "pets" - response_harm = "hits" - -/mob/living/simple_animal/pokemon/eevee/umbreon - name = "umbreon" - icon_state = "umbreon" - icon_dead = "umbreon_d" - icon_living = "umbreon" - -/mob/living/simple_animal/pokemon/vulpix - name = "vulpix" - icon_state = "vulpix" - icon_living = "vulpix" - icon_dead = "vulpix_d" diff --git a/modular_citadel/code/modules/research/techweb/all_nodes.dm b/modular_citadel/code/modules/research/techweb/all_nodes.dm deleted file mode 100644 index c0ddaceaf7..0000000000 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dm +++ /dev/null @@ -1,36 +0,0 @@ -/datum/techweb_node/bluespace_basic/New() - . = ..() - design_ids += "xenobio_monkeys" - -/datum/techweb_node/practical_bluespace/New() - . = ..() - design_ids += "xenobio_slimebasic" - -/datum/techweb_node/adv_bluespace/New() - . = ..() - design_ids += "xenobio_slimeadv" - -/datum/techweb_node/ballistic_weapons/New() - . = ..() - design_ids += "mag_oldsmg_rubber" - -/datum/techweb_node/computer_board_gaming - id = "computer_board_gaming" - display_name = "Games and Toys" - description = "For the slackers on the station." - prereq_ids = list("comptech") - design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) - export_price = 5000 - -/datum/techweb_node/ballistic_weapons - design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx") - -/datum/techweb_node/advanced_illegl_ballistics - id = "advanced_illegal_ballistics" - display_name = "Advanced Illegal Ballistics" - description = "Advanced Ballistic for Illegal weaponds." - design_ids = list("10mm","10mmap","10mminc","10mmhp","pistolm9mm","m45","bolt_clip") - prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns form traitors or space. - export_price = 7000 diff --git a/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm b/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm deleted file mode 100644 index d968cfdcc7..0000000000 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm +++ /dev/null @@ -1,33 +0,0 @@ -/datum/techweb_node/bluespace_basic/New() - . = ..() - design_ids += "xenobio_monkeys" - -/datum/techweb_node/practical_bluespace/New() - . = ..() - design_ids += "xenobio_slimebasic" - -/datum/techweb_node/adv_bluespace/New() - . = ..() - design_ids += "xenobio_slimeadv" - -/datum/techweb_node/ballistic_weapons/New() - . = ..() - design_ids += "mag_oldsmg_rubber" - -/datum/techweb_node/computer_board_gaming - id = "computer_board_gaming" - display_name = "Games and Toys" - description = "For the slackers on the station." - prereq_ids = list("comptech") - design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) - export_price = 5000 - -/datum/techweb_node/advanced_illegl_ballistics - id = "advanced_illegal_ballistics" - display_name = "Advanced Illegal Ballistics - description = "Advanced Ballistic for Illegal weaponds." - design_ids = list("10mm","10mmap","10mminc","10mmhp","9mm","point_45","bolt_clip") - prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns form traitors or space. - export_price = 7000 diff --git a/modular_citadel/icons/misc/misc.dmi b/modular_citadel/icons/misc/misc.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/misc/misc.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/citadel/glasses.dmi b/modular_citadel/icons/mob/citadel/glasses.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/mob/citadel/glasses.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/citadel/head.dmi b/modular_citadel/icons/mob/citadel/head.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/mob/citadel/head.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/citadel/masks.dmi b/modular_citadel/icons/mob/citadel/masks.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/mob/citadel/masks.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/citadel/shoes.dmi b/modular_citadel/icons/mob/citadel/shoes.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/mob/citadel/shoes.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/werenerd.dmi b/modular_citadel/icons/mob/werenerd.dmi deleted file mode 100644 index 706d4248f8..0000000000 Binary files a/modular_citadel/icons/mob/werenerd.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/werenerdleap.dmi b/modular_citadel/icons/mob/werenerdleap.dmi deleted file mode 100644 index eb5339733b..0000000000 Binary files a/modular_citadel/icons/mob/werenerdleap.dmi and /dev/null differ diff --git a/modular_citadel/icons/obj/structures.dmi b/modular_citadel/icons/obj/structures.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/modular_citadel/icons/obj/structures.dmi and /dev/null differ