| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message] |
| Sender | -Sender's Job | -Recipient | -Message |
| [customsender] | -[customjob] | -[customrecepient ? customrecepient.owner : "NONE"] | -[custommessage] |
| " + dat += " | = 0 && !isobserver(user))
dat += " Remove Selected Piece" - user << browse(dat,"window=boardgame;size=500x500") + user << browse(jointext(dat, null),"window=boardgame;size=250x250") onclose(usr, "boardgame") /obj/item/board/Topic(href, href_list) @@ -174,6 +174,16 @@ obj/item/board/attackby(obj/item/I as obj, mob/user as mob) icon_state = "checker_black" volumeClass = ITEM_SIZE_TINY -/obj/item/checker/red - name = "red checker" - icon_state = "checker_red" +/obj/item/checker/queen + name = "black checker queen" + desc = "Two black checkers stacked to form a queen. This one seems to have been glued together..." + icon_state = "checker_black_queen" + +/obj/item/checker/white + name = "white checker" + icon_state = "checker_white" + +/obj/item/checker/white/queen + name = "white checker queen" + desc = "Two white checkers stacked to form a queen. This one seems to have been glued together..." + icon_state = "checker_white_queen" diff --git a/code/modules/genetics/stationary_scanner.dm b/code/modules/genetics/stationary_scanner.dm index 128b064d92..bd33f704b2 100644 --- a/code/modules/genetics/stationary_scanner.dm +++ b/code/modules/genetics/stationary_scanner.dm @@ -41,7 +41,7 @@ /obj/machinery/cryo_slab/verb/move_inside() set src in view(1) set category = "Object" - set name = "Enter [src]" + name = "Enter [name]" if(usr.incapacitated() || !ishuman(usr)) return diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 99e09782d0..49890e1772 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(ghost_trap_users) // Fluff! /datum/ghosttrap/proc/welcome_candidate(var/mob/target) - to_chat(target, "You are a positronic brain, brought into existence on [station_name()].") + to_chat(target, "You are a positronic brain, brought into existence on [station_name].") to_chat(target, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") to_chat(target, "Remember, the purpose of your existence is to serve the crew and the ship. Above all else, do no harm.") to_chat(target, "Use say [target.get_language_prefix()]b to speak to other artificial intelligences.") diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 3b73829b41..bb67d5f6a4 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -237,7 +237,7 @@ create_spores(origin_turf) - var/flood_dist = min(10,max(1,get_trait(TRAIT_POTENCY)/15)) + var/flood_dist = min(10,max(1,get_trait(TRAIT_POTENCY)/50)) var/list/open_turfs = list() var/list/closed_turfs = list() var/list/valid_turfs = list() diff --git a/code/modules/maps/dmm_suite.dm b/code/modules/maps/dmm_suite.dm index c263072f99..e14438eaca 100644 --- a/code/modules/maps/dmm_suite.dm +++ b/code/modules/maps/dmm_suite.dm @@ -1,6 +1,6 @@ var/global/dmm_suite/maploader = new -dmm_suite{ +dmm_suite /* dmm_suite version 1.0 @@ -53,21 +53,16 @@ dmm_suite{ */ - verb/load_map(var/dmm_file as file, var/z_offset as num) + proc/load_map(var/dmm_file as file, var/z_offset as num) // dmm_file: A .dmm file to load (Required). // z_offset: A number representing the z-level on which to start loading the map (Optional). - - verb/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ + proc/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num) // t1: A turf representing one corner of a three dimensional grid (Required). // t2: Another turf representing the other corner of the same grid (Required). // flags: Any, or a combination, of several bit flags (Optional, see documentation). - } - // save_map is included as a legacy proc. Use write_map instead. - verb/save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num){ + proc/save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num) // t1: A turf representing one corner of a three dimensional grid (Required). // t2: Another turf representing the other corner of the same grid (Required). // map_name: A valid name for the map to be saved, such as "castle" (Required). // flags: Any, or a combination, of several bit flags (Optional, see documentation). - } - } \ No newline at end of file diff --git a/code/modules/maps/writer.dm b/code/modules/maps/writer.dm deleted file mode 100644 index 2dde1e8c9f..0000000000 --- a/code/modules/maps/writer.dm +++ /dev/null @@ -1,174 +0,0 @@ -#define DMM_IGNORE_AREAS 1 -#define DMM_IGNORE_TURFS 2 -#define DMM_IGNORE_OBJS 4 -#define DMM_IGNORE_NPCS 8 -#define DMM_IGNORE_PLAYERS 16 -#define DMM_IGNORE_MOBS 24 -dmm_suite{ - var{ - quote = "\"" - list/letter_digits = list( - "a","b","c","d","e", - "f","g","h","i","j", - "k","l","m","n","o", - "p","q","r","s","t", - "u","v","w","x","y", - "z", - "A","B","C","D","E", - "F","G","H","I","J", - "K","L","M","N","O", - "P","Q","R","S","T", - "U","V","W","X","Y", - "Z" - ) - } - save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num){ - //Check for illegal characters in file name... in a cheap way. - if(!((ckeyEx(map_name)==map_name) && ckeyEx(map_name))){ - CRASH("Invalid text supplied to proc save_map, invalid characters or empty string.") - } - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc save_map, arguments were not turfs.") - } - var/file_text = write_map(t1,t2,flags) - if(fexists("[map_name].dmm")){ - fdel("[map_name].dmm") - } - var/saved_map = file("[map_name].dmm") - saved_map << file_text - return saved_map - } - write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc write_map, arguments were not turfs.") - } - var/turf/nw = locate(min(t1.x,t2.x),max(t1.y,t2.y),min(t1.z,t2.z)) - var/turf/se = locate(max(t1.x,t2.x),min(t1.y,t2.y),max(t1.z,t2.z)) - var/list/templates[0] - var/template_buffer = {""} - var/dmm_text = {""} - for(var/pos_z=nw.z;pos_z<=se.z;pos_z++){ - for(var/pos_y=nw.y;pos_y>=se.y;pos_y--){ - for(var/pos_x=nw.x;pos_x<=se.x;pos_x++){ - var/turf/test_turf = locate(pos_x,pos_y,pos_z) - var/test_template = make_template(test_turf, flags) - var/template_number = templates.Find(test_template) - if(!template_number){ - templates.Add(test_template) - template_number = templates.len - } - template_buffer += "[template_number]," - } - template_buffer += ";" - } - template_buffer += "." - } - var/key_length = round/*floor*/(log(letter_digits.len,templates.len-1)+1) - var/list/keys[templates.len] - for(var/key_pos=1;key_pos<=templates.len;key_pos++){ - keys[key_pos] = get_model_key(key_pos,key_length) - dmm_text += {""[keys[key_pos]]" = ([templates[key_pos]])\n"} - } - var/z_level = 0 - for(var/z_pos=1;;z_pos=findtext(template_buffer,".",z_pos)+1){ - if(z_pos>=length(template_buffer)){break} - if(z_level){dmm_text+={"\n"}} - dmm_text += {"\n(1,1,[++z_level]) = {"\n"} - var/z_block = copytext(template_buffer,z_pos,findtext(template_buffer,".",z_pos)) - for(var/y_pos=1;;y_pos=findtext(z_block,";",y_pos)+1){ - if(y_pos>=length(z_block)){break} - var/y_block = copytext(z_block,y_pos,findtext(z_block,";",y_pos)) - for(var/x_pos=1;;x_pos=findtext(y_block,",",x_pos)+1){ - if(x_pos>=length(y_block)){break} - var/x_block = copytext(y_block,x_pos,findtext(y_block,",",x_pos)) - var/key_number = text2num(x_block) - var/temp_key = keys[key_number] - dmm_text += temp_key - sleep(-1) - } - dmm_text += {"\n"} - sleep(-1) - } - dmm_text += {"\"}"} - sleep(-1) - } - return dmm_text - } - proc{ - make_template(var/turf/model as turf, var/flags as num){ - var/template = "" - var/obj_template = "" - var/mob_template = "" - var/turf_template = "" - if(!(flags & DMM_IGNORE_TURFS)){ - turf_template = "[model.type][check_attributes(model)]," - } else{ turf_template = "[world.turf],"} - var/area_template = "" - if(!(flags & DMM_IGNORE_OBJS)){ - for(var/obj/O in model.contents){ - obj_template += "[O.type][check_attributes(O)]," - } - } - for(var/mob/M in model.contents){ - if(M.client){ - if(!(flags & DMM_IGNORE_PLAYERS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - else{ - if(!(flags & DMM_IGNORE_NPCS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - } - if(!(flags & DMM_IGNORE_AREAS)){ - var/area/m_area = model.loc - area_template = "[m_area.type][check_attributes(m_area)]" - } else{ area_template = "[world.area]"} - template = "[obj_template][mob_template][turf_template][area_template]" - return template - } - check_attributes(var/atom/A){ - var/attributes_text = {"{"} - for(var/V in A.vars){ - sleep(-1) - if((!issaved(A.vars[V])) || (A.vars[V]==initial(A.vars[V]))){continue} - if(istext(A.vars[V])){ - attributes_text += {"[V] = "[A.vars[V]]""} - } - else if(isnum(A.vars[V])||ispath(A.vars[V])){ - attributes_text += {"[V] = [A.vars[V]]"} - } - else if(isicon(A.vars[V])||isfile(A.vars[V])){ - attributes_text += {"[V] = '[A.vars[V]]'"} - } - else{ - continue - } - if(attributes_text != {"{"}){ - attributes_text+={"; "} - } - } - if(attributes_text=={"{"}){ - return - } - if(copytext(attributes_text, length(attributes_text)-1, 0) == {"; "}){ - attributes_text = copytext(attributes_text, 1, length(attributes_text)-1) - } - attributes_text += {"}"} - return attributes_text - } - get_model_key(var/which as num, var/key_length as num){ - var/key = "" - var/working_digit = which-1 - for(var/digit_pos=key_length;digit_pos>=1;digit_pos--){ - var/place_value = round/*floor*/(working_digit/(letter_digits.len**(digit_pos-1))) - working_digit-=place_value*(letter_digits.len**(digit_pos-1)) - key = "[key][letter_digits[place_value+1]]" - } - return key - } - } - } \ No newline at end of file diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 37fbff65ba..62766998b1 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -298,7 +298,7 @@ rand_min = 3 rand_max = 30 spawn_tags = SPAWN_TAG_MATERIAL_RESOURCES_BULDING - rarity_value = 18 + rarity_value = 10 /obj/item/stack/material/plasteel name = "plasteel" @@ -312,7 +312,7 @@ rand_min = 3 rand_max = 20 spawn_tags = SPAWN_TAG_MATERIAL_BUILDING - rarity_value = 10 + rarity_value = 18 /obj/item/stack/material/plasteel/full amount = 120 @@ -372,8 +372,8 @@ /obj/item/stack/material/glass/random rand_min = 3 rand_max = 30 - spawn_tags = SPAWN_TAG_MATERIAL_RESOURCES_BULDING - rarity_value = 22.5 + spawn_tags = SPAWN_TAG_MATERIAL_BUILDING + rarity_value = 12.5 /obj/item/stack/material/glass/full amount = 120 diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 3fd4ee67b1..e7f1885650 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -108,6 +108,7 @@ var/list/name_to_material var/radioactivity // Radiation var. Used in wall and object processing to irradiate surroundings. var/ignition_point // K, point at which the material catches on fire. var/melting_point = 1800 // K, walls will take damage if they're next to a fire hotter than this + var/heat_resistance = 1 // divisor, walls resist thermite and welding based on this var/integrity = 150 // General-use HP value for products. var/opacity = 1 // Is the material transparent? 0.5< makes transparent walls/doors. var/conductive = 1 // Objects with this var add CONDUCTS to flags on spawn. diff --git a/code/modules/mechs/components/armour.dm b/code/modules/mechs/components/armour.dm index 5f0f2e56d6..64cddb1efd 100644 --- a/code/modules/mechs/components/armour.dm +++ b/code/modules/mechs/components/armour.dm @@ -7,7 +7,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit name = "exosuit armor plating" - armor = list(ARMOR_BLUNT = 20, ARMOR_BULLET = 8, ARMOR_ENERGY = 2, ARMOR_BOMB =100, ARMOR_BIO =100, ARMOR_RAD =0) + armor = list(ARMOR_BLUNT = 20, ARMOR_BULLET = 8, ARMOR_ENERGY = 2, ARMOR_BOMB =100, ARMOR_BIO =100, ARMOR_RAD = 0) origin_tech = list(TECH_MATERIAL = 1) matter = list(MATERIAL_STEEL = 7) spawn_tags = SPAWN_TAG_MECH_QUIPMENT @@ -23,7 +23,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/plain name = "standard exosuit plating" desc = "A sturdy hunk of steel and plasteel plating, offers decent protection from physical harm and environmental hazards whilst being cheap to produce." - armor = list(melee = 24, bullet = 10, energy = 9, bomb = 125, bio = 100, rad = 100) + armor = list(ARMOR_BLUNT = 24, ARMOR_BULLET = 10, ARMOR_ENERGY = 9, ARMOR_BOMB = 125 , ARMOR_BIO = 100, ARMOR_RAD = 100) origin_tech = list(TECH_MATERIAL = 3) matter = list(MATERIAL_STEEL = 15, MATERIAL_PLASTEEL = 10) //Plasteel for the shielding spawn_blacklisted = FALSE @@ -32,7 +32,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/ablative name = "ablative exosuit armor plating" desc = "This plating is built to shrug off laser impacts and block electromagnetic pulses, but is rather vulnerable to brute trauma." - armor = list(melee = 16, bullet = 6, energy = 38, bomb = 50, bio = 100, rad = 50) + armor = list(ARMOR_BLUNT = 16, ARMOR_BULLET = 10, ARMOR_ENERGY = 38, ARMOR_BOMB = 125 , ARMOR_BIO = 100, ARMOR_RAD = 100) origin_tech = list(TECH_MATERIAL = 3) matter = list(MATERIAL_STEEL = 15, MATERIAL_PLASMA = 5) spawn_blacklisted = FALSE @@ -41,7 +41,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/combat name = "heavy combat exosuit plating" desc = "Plating designed to deflect incoming attacks and explosions." - armor = list(melee = 32, bullet = 24, energy = 16, bomb = 300, bio = 100, rad = 50) // 32 melee. That's 10 damage from a STOCK circular saw. + armor = list(ARMOR_BLUNT = 32, ARMOR_BULLET = 20, ARMOR_ENERGY = 20, ARMOR_BOMB = 125 , ARMOR_BIO = 100, ARMOR_RAD = 100) origin_tech = list(TECH_MATERIAL = 5) matter = list(MATERIAL_STEEL = 20, MATERIAL_DIAMOND = 5, MATERIAL_URANIUM = 5) spawn_blacklisted = FALSE diff --git a/code/modules/mechs/mech_movement.dm b/code/modules/mechs/mech_movement.dm index 51b9019d93..6f09e6b6c3 100644 --- a/code/modules/mechs/mech_movement.dm +++ b/code/modules/mechs/mech_movement.dm @@ -174,7 +174,6 @@ return MOVEMENT_HANDLED else mob.inertia_dir = 0 //If not then we can reset inertia and move - else /datum/movement_handler/mob/space/exosuit/MayMove(var/mob/mover, var/is_external) if((mover != host) && is_external) diff --git a/code/modules/cargo/supplyshuttle.dm b/code/modules/mining/plasticflaps.dm similarity index 87% rename from code/modules/cargo/supplyshuttle.dm rename to code/modules/mining/plasticflaps.dm index 4103265b6b..7dda367f8f 100644 --- a/code/modules/cargo/supplyshuttle.dm +++ b/code/modules/mining/plasticflaps.dm @@ -1,16 +1,3 @@ - -/area/supply/station - name = "supply shuttle" - icon_state = "shuttle3" - requires_power = 0 - -/area/supply/dock - name = "supply shuttle" - icon_state = "shuttle3" - requires_power = 0 - -//SUPPLY PACKS MOVED TO /code/modules/cargo/packs.dm - /obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY name = "\improper plastic flaps" desc = "Completely impassable - or are they?" @@ -19,7 +6,6 @@ density = FALSE anchored = TRUE layer = 4 - /* /obj/structure/plasticflaps/CanAStarPass(obj/item/card/id/ID, to_dir, caller) if(istype(caller, /obj/machinery/bot/mulebot)) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 5f8362e550..5cd8a9d146 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -37,7 +37,7 @@ brainmob = null . = ..() -/obj/item/organ/internal/vital/brain/take_damage(amount, damage_type = BRUTE, wounding_multiplier = 1, silent = FALSE, sharp = FALSE, edge = FALSE) +/obj/item/organ/internal/vital/brain/take_damage(amount, damage_type = BRUTE, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, silent = FALSE) if(!damage_type || status & ORGAN_DEAD) return @@ -48,6 +48,52 @@ health = 0 ..(wound_damage, damage_type, wounding_multiplier, sharp, edge, silent) +/obj/item/organ/internal/vital/brain/get_possible_wounds(damage_type, sharp, edge) + var/list/possible_wounds = list() + + // Determine possible wounds based on nature and damage type + var/is_robotic = BP_IS_ROBOTIC(src) + var/is_organic = BP_IS_ORGANIC(src) || BP_IS_ASSISTED(src) + + switch(damage_type) + if(BRUTE) + if(!edge) + if(sharp) // dont even fucking ask whats the difference between this and eyes get_possible_wounds. I dont know, I wont tell you. + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/brain_sharp)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/brain_sharp)) + else + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/brain_blunt)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/brain_blunt)) + else + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/brain_edge)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/brain_edge)) + if(BURN) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/brain_burn)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/brain_emp_burn)) + if(TOX) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/poisoning)) + //if(is_robotic) + // LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/poisoning)) + if(CLONE) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/radiation)) + if(PSY) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/sanity)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/sanity)) + + return possible_wounds + /// Brain blood oxygenation is handled via oxyloss /obj/item/organ/internal/vital/brain/handle_blood() if(BP_IS_ROBOTIC(src) || !owner) @@ -92,7 +138,7 @@ if(!(owner.status_flags & REBUILDING_ORGANS)) var/mob/living/simple_animal/borer/borer = owner.get_brain_worms() if(borer) - borer.detatch() //Should remove borer if the brain is removed - RR + borer.detach() //Should remove borer if the brain is removed - RR var/obj/item/organ/internal/carrion/core/C = owner.random_organ_by_process(BP_SPCORE) if(C) diff --git a/code/modules/mob/living/carbon/carbon_powers.dm b/code/modules/mob/living/carbon/carbon_powers.dm index 98f82fc347..b23ac93576 100644 --- a/code/modules/mob/living/carbon/carbon_powers.dm +++ b/code/modules/mob/living/carbon/carbon_powers.dm @@ -1,3 +1,5 @@ + +//FILE: Borer gets powers from this one once he Assumes Control //Brain slug proc for voluntary removal of control. /mob/living/carbon/proc/release_control() @@ -10,7 +12,7 @@ if(B && B.host_brain) to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]") - B.detatch() + B.detach() verbs |= /mob/living/carbon/human/proc/commune verbs |= /mob/living/carbon/human/proc/psychic_whisper @@ -49,21 +51,25 @@ set desc = "Spawn several young." var/mob/living/simple_animal/borer/B = get_brain_worms() - + var/reproduce_cost = (round(B.max_chemicals_inhost * 0.75)) if(!B) return - if(B.chemicals >= 100) + if(B.chemicals >= reproduce_cost) to_chat(src, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.") visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") - B.chemicals -= 100 + B.chemicals -= reproduce_cost B.has_reproduced = 1 - B.borer_add_exp(10) + if(istype(B.host, /mob/living/carbon/human/) && !B.host.isMonkey())// this is a mess but host's var grabs "[human_name] (mob/living/carbon/human/)" + B.borer_add_exp(25) + else + to_chat(src, SPAN_WARNING("You do not have anything to learn from this host. Find a human!")) + new /obj/effect/decal/cleanable/vomit(get_turf(src)) playsound(loc, 'sound/effects/splat.ogg', 50, 1) new /mob/living/simple_animal/borer(get_turf(src)) else - to_chat(src, "You do not have enough chemicals stored to reproduce.") + to_chat(src, "You do not have enough chemicals stored to reproduce. (You need [reproduce_cost]).") return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index f84f887f39..91af89c102 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -400,7 +400,6 @@ if (M) message = "points to [M]." - else m_type = 1 if ("raise") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f76b65f059..6227fe86dc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1408,21 +1408,32 @@ var/list/rank_prefix = list(\ reset_view(A) /mob/living/carbon/human/proc/resuscitate() + var/obj/item/organ/internal/vital/heart_organ = random_organ_by_process(OP_HEART) var/obj/item/organ/internal/vital/brain_organ = random_organ_by_process(BP_BRAIN) - if(!is_asystole() && !(heart_organ && brain_organ) || (heart_organ.is_broken() || brain_organ.is_broken())) + if((!heart_organ || heart_organ.is_broken()) && (!brain_organ || brain_organ.is_broken())) + resuscitate_notify(1) + return 0 + + if(!heart_organ || heart_organ.is_broken()) + resuscitate_notify(2) + return 0 + + if(!brain_organ || brain_organ.is_broken()) + resuscitate_notify(3) return 0 if(world.time >= (timeofdeath + NECROZTIME)) + resuscitate_notify(4) return 0 var/oxyLoss = getOxyLoss() if(oxyLoss > 20) setOxyLoss(20) - if(health <= (HEALTH_THRESHOLD_DEAD - oxyLoss)) - visible_message(SPAN_WARNING("\The [src] twitches a bit, but their body is too damaged to sustain life!")) + if(getBruteLoss() + getFireLoss() >= abs(HEALTH_THRESHOLD_DEAD)) + resuscitate_notify(5) timeofdeath = 0 return 0 @@ -1444,6 +1455,34 @@ var/list/rank_prefix = list(\ break return 1 +/mob/living/carbon/human/proc/resuscitate_notify(type) + visible_message(SPAN_WARNING("\The [src] twitches and twists intensely!")) + for(var/mob/O in viewers(world.view, src.loc)) + if(O == src) + continue + if(!Adjacent(O)) + continue + var/bio_stat = STAT_LEVEL_NONE + if(O.stats) + bio_stat = O.stats.getStat(STAT_BIO) + if(isghost(O)) + bio_stat = STAT_LEVEL_GODLIKE + + if(bio_stat >= STAT_LEVEL_BASIC && prob(clamp((bio_stat / STAT_LEVEL_EXPERT) * 100, 0, 100))) + switch(type) + if(1) //brain and heart fail + to_chat(O, "You can identify that [src]'s circulatory and central neural systems are failing, preventing them from resurrection.") + if(2) //heart fail + to_chat(O, "You can identify that [src]'s circulatory system is unable to restart in this state.") + if(3) //brain fail + to_chat(O, "You can identify that [src]'s central neural system is too damaged to be resurrected.") + if(4) //corpse is too old + to_chat(O, "You see that rotting process in [src]'s body already gone too far. This is nothing but a corpse now.") + if(5) //too much damage + to_chat(O, "[src]'s body is too damaged to sustain life.") + else + to_chat(O, "You're too unskilled to understand what's happening...") + /mob/living/carbon/human/proc/generate_dna() if(!b_type) b_type = pick(GLOB.blood_types) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index c1887b6f86..6e132993ef 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -320,7 +320,7 @@ This function restores all organs. zone = BP_HEAD return organs_by_name[zone] -/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone, armor_divisor = 1, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, obj/used_weapon, armor_divisor) +/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone, armor_divisor = 1, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, obj/used_weapon) //visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]") //Handle other types of damage diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index cf05e64b34..d49f92af2e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -34,6 +34,10 @@ meteor_act var/obj/item/material/shard/shrapnel/SP = new() SP.name = (P.name != "shrapnel")? "[P.name] shrapnel" : "shrapnel" SP.desc = "[SP.desc] It looks like it was fired from [P.shot_from]." + SP.loc = organ + if(length(P.matter)) + SP.material = P.matter[1] + SP.amount = P.matter[SP.material] // amount no longer randomized SP.forceMove(organ) organ.embed(SP) else if(check_absorb <= (P.getAllDamType(BRUTE)/3)) diff --git a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm index 0d3fea1334..1eb4608562 100644 --- a/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm +++ b/code/modules/mob/living/carbon/superior_animal/giant_spider/types/nurse.dm @@ -169,7 +169,6 @@ for(var/obj/O in targetTurf) if (O.anchored) continue - if (istype(O, /obj/item)) else if (istype(O, /obj/structure) || istype(O, /obj/machinery)) large_cocoon = 1 else diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index a3ee660c1c..8caa11f856 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -51,8 +51,6 @@ armorType defines the armorType that will block all the damTypes that it has ass var/list/atom/damageBlockers = list() /// Retrieve all relevanta damage blockers , its why we give them the dmgtypes list damageBlockers = getDamageBlockers(armorToDam, armorDiv, woundMult, defZone) - - for(var/atom in damageBlockers) /// We are going to order the list to be traversed from right to left , right representing the outermost layers and left the innermost /// List for insertion-sort. Upper objects are going to be last , lower ones are going to be first when blocking var/list/blockersTemp = list( @@ -63,11 +61,11 @@ armorType defines the armorType that will block all the damTypes that it has ass /obj/item/organ/external, /obj/item/clothing, /obj/item/armor_component, - /obj/item/robot_parts/robot_component/armour, + /obj/item/robot_parts/robot_component/armour ) var/list/atom/newBlockers = list() - for(var/i = length(blockersTemp); i > 1; i--) + for(var/i=length(blockersTemp), i > 1, i--) var/path = blockersTemp[i] for(var/atom/blocker in damageBlockers) if(istype(blocker, path)) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9ed8e8fb6c..d59f0dfa1c 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -76,7 +76,6 @@ /mob/living/silicon/pai/New(var/obj/item/device/paicard) src.forceMove(paicard) card = paicard - sradio = new(src) if(card) if(!card.radio) card.radio = new /obj/item/device/radio(src.card) diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 0b52274ac2..7855c6da1a 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -394,45 +394,3 @@ is_active(mob/living/silicon/pai/user) return user.translator_on -/datum/pai_software/signaller - name = "Remote Signaller" - ram_cost = 5 - id = "signaller" - toggle = 0 - - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] - - data["frequency"] = format_frequency(user.sradio.frequency) - data["code"] = user.sradio.code - - ui = SSnano.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_signaller.tmpl", "Signaller", 320, 150) - ui.set_initial_data(data) - ui.open() - - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return - - if(href_list["send"]) - P.sradio.send_signal("ACTIVATE") - for(var/mob/O in hearers(1, P.loc)) - O.show_message("\icon[P] *beep* *beep*", 3, "*beep* *beep*", 2) - return 1 - - else if(href_list["freq"]) - var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"])) - if(new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ) - new_frequency = sanitize_frequency(new_frequency) - P.sradio.set_frequency(new_frequency) - return 1 - - else if(href_list["code"]) - P.sradio.code += text2num(href_list["code"]) - P.sradio.code = round(P.sradio.code) - P.sradio.code = min(100, P.sradio.code) - P.sradio.code = max(1, P.sradio.code) - return 1 diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 074c438d56..764d7fc276 100755 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -122,6 +122,7 @@ if(wood) wood.add_charge(4000) else if(istype(W,/obj/item/pipe)) + EMPTY_BLOCK_GUARD // This allows drones and engiborgs to clear pipe assemblies from floors. else continue diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index f8a4fe2acf..765887067c 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -29,6 +29,9 @@ pass_flags = PASSTABLE universal_understand = 1 faction = "borers" + can_pull_size = ITEM_SIZE_TINY + can_pull_mobs = MOB_PULL_NONE + density = FALSE var/borer_level = 0 var/borer_exp = 0 @@ -43,6 +46,7 @@ var/docile = FALSE // Sugar can stop borers from acting. var/has_reproduced var/roundstart + var/invisibility_cost = 5 // Abilities borer can use when outside the host var/list/abilities_standalone = list( @@ -87,7 +91,7 @@ var/obj/item/organ/external/head = H.get_organ(BP_HEAD) head.implants.Remove(src) // This should be safe. if(controlling) - detatch() + detach() return ..() /mob/living/simple_animal/borer/Login() @@ -150,9 +154,11 @@ chemicals++ /mob/living/simple_animal/borer/proc/process_invisibility() - if(invisibility == TRUE) - chemicals -= 1 - if(chemicals <= 2) + if(invisibility) + chemicals -= invisibility_cost + if(chemicals <= max_chemicals/2 && (max_chemicals/2) - invisibility_cost <= chemicals) + to_chat(src, to_chat(src, "\red Your invisibility will run out soon!")) + if(chemicals <= invisibility_cost + 1) invisible() // Disable invisibility chemicals = 0 @@ -160,7 +166,7 @@ to_chat(host, SPAN_DANGER("You feel your control over your host suddenly stop.")) update_abilities() spawn(1) - detatch() + detach() /mob/living/simple_animal/borer/proc/process_host() if(host && !stat) @@ -217,7 +223,7 @@ stat("Host health", host.stat == DEAD ? "Deceased" : host.health) stat("Host brain damage", host.getBrainLoss()) -/mob/living/simple_animal/borer/proc/detatch() +/mob/living/simple_animal/borer/proc/detach() if(!host || !controlling) return @@ -357,7 +363,7 @@ alpha = 255 invisibility = 0 if(controlling || host) - detatch() + detach() leave_host() /mob/living/simple_animal/borer/update_sight() diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm index d3936b3b4f..c2a7b02487 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm @@ -59,16 +59,16 @@ var/mob/living/simple_animal/borer/B = src.loc var/mob/living/captive_brain/H = src - to_chat(H, SPAN_DANGER("You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).")) + to_chat(H, SPAN_DANGER("You begin doggedly resisting the parasite's control (this will take approximately thirty seconds).")) to_chat(B.host, SPAN_DANGER("You feel the captive mind of [src] begin to resist your control.")) - spawn(rand(200,250)+B.host.brainloss) + spawn(rand(25 SECONDS, 30 SECONDS)+B.host.brainloss) if(!B || !B.controlling) return B.host.adjustBrainLoss(rand(0.1,0.5)) to_chat(H, SPAN_DANGER("With an immense exertion of will, you regain control of your body!")) to_chat(B.host, SPAN_DANGER("You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.")) - B.detatch() + B.detach() verbs |= /mob/living/carbon/human/proc/commune verbs |= /mob/living/carbon/human/proc/psychic_whisper verbs |= /mob/living/carbon/proc/spawn_larvae diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 59a6af5ff3..6b79b78e9d 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -30,7 +30,7 @@ to_chat(host, SPAN_DANGER("As though waking from a dream, you shake off the insidious mind control of the brain worm. Your thoughts are your own again.")) to_chat(host, SPAN_DANGER("Something slimy wiggles out of your ear and plops to the ground!")) - detatch() + detach() leave_host() /mob/living/simple_animal/borer/proc/infest() @@ -56,10 +56,13 @@ var/mob/living/carbon/M = input(src,"Who do you wish to infest?") in null|choices - // non-humanoids disabled due to not working. + //non-humanoids disabled due to not working. if(!M || !Adjacent(M) || !iscarbon(M)) return + if((ishuman(M) && !M.isMonkey()) && (!M.mind || !M.client)) + to_chat(src, SPAN_WARNING("Host's body is in a state of hibernation, you are afraid to be crushed when they roll over in their sleep!")) + return if(M.has_brain_worms()) to_chat(src, SPAN_WARNING("You cannot infest someone who is already infested!")) return @@ -234,8 +237,8 @@ if(stat) return - if(world.time - used_dominate < 150) - to_chat(src, SPAN_WARNING("You cannot use that ability again so soon.")) + if(world.time - used_dominate < 1 MINUTE) // a one minutes cooldown. + to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") return if(is_ventcrawling) @@ -259,8 +262,8 @@ var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices - if(world.time - used_dominate < 150) - to_chat(src, SPAN_WARNING("You cannot use that ability again so soon.")) + if(world.time - used_dominate < 1 MINUTE) + to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") return if(!M || !Adjacent(M)) return @@ -275,6 +278,9 @@ to_chat(src, "You cannot paralyze someone who is already infested!") return + if(invisibility) + invisible() //removes invisibility on using paralyze + to_chat(src, SPAN_NOTICE("You become visible again.")) to_chat(src, SPAN_WARNING("You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.")) to_chat(M, SPAN_DANGER("You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.")) var/duration = 10 + (borer_level*2) @@ -304,9 +310,9 @@ to_chat(src, SPAN_WARNING("You can't control a dead host.")) return - to_chat(src, SPAN_NOTICE("You begin delicately adjusting your connection to the host brain...")) + to_chat(src, SPAN_NOTICE("You begin delicately adjusting your connection to the host brain. This will take some time...")) - spawn(100+(host.brainloss*5)) + spawn(30 SECONDS + (host.brainloss * 5)) if(!host || !src || controlling) return @@ -534,8 +540,8 @@ if(stat) return - if(world.time - used_dominate < 150) - to_chat(src, "\red You cannot use that ability again so soon.") + if(world.time - used_dominate < 1 MINUTE) + to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") return if(host) @@ -581,23 +587,30 @@ if(stat) return + if(docile) + to_chat(src, SPAN_DANGER("You are feeling far too docile to do that.")) + return + if(!host) to_chat(src, "\red You cannot do this without a host.") return - - if(chemicals >= 100) + var/reproduce_cost = (round(max_chemicals_inhost * 0.75)) // literally max chems but 75% of it + if(chemicals >= reproduce_cost) to_chat(host, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.") visible_message("\red [host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") - chemicals -= 100 has_reproduced = TRUE - borer_add_exp(10) + chemicals -= reproduce_cost + if(istype(host, /mob/living/carbon/human/) && !host.isMonkey()) + borer_add_exp(25) + else + to_chat(src, SPAN_WARNING("You do not have anything to learn from this host. Find a human!")) new /obj/effect/decal/cleanable/vomit(get_turf(host)) playsound(loc, 'sound/effects/splat.ogg', 50, 1) new /mob/living/simple_animal/borer(get_turf(host)) else - to_chat(src, SPAN_NOTICE("You do not have enough chemicals stored to reproduce.")) + to_chat(src, SPAN_NOTICE("You do not have enough chemicals stored to reproduce. (You need [reproduce_cost]).")) return /mob/living/simple_animal/borer/proc/commune() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index ab65d71785..d77b10dfb4 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -181,6 +181,7 @@ qdel(src) var/const/MAX_CHICKENS = 50 +#define MEDIUM_CHICKENS 10 var/global/chicken_count = 0 /mob/living/simple_animal/chicken @@ -247,8 +248,8 @@ var/global/chicken_count = 0 var/obj/item/reagent_containers/food/snacks/egg/E = new(get_turf(src)) E.pixel_x = rand(-6,6) E.pixel_y = rand(-6,6) - if(chicken_count < MAX_CHICKENS && prob(10)) - START_PROCESSING(SSobj, E) + if(chicken_count < MEDIUM_CHICKENS || prob(clamp((100/MAX_CHICKENS)*(MAX_CHICKENS-chicken_count), 0, 100))) + START_PROCESSING(SSobj, E) // chicken threshold, then chicken ratio, then number of chickens to create /obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 9646b25e9f..30491058f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -79,6 +79,8 @@ var/action = pick( list( "growls at [target_mob].", "stares angrily at [target_mob].", "prepares to attack [target_mob]!", "closely watches [target_mob]." ) ) if(action) visible_emote(action) + if(prob(33)) + playsound(src, 'sound/voice/bear_growl.ogg', 100, 1) if(!found_mob) stance_step-- @@ -90,6 +92,8 @@ if(HOSTILE_STANCE_ATTACKING) if(stance_step >= 20) //attacks for 20 ticks, then it gets tired and needs to rest visible_emote("is worn out and needs to rest.") + if(prob(33)) + playsound(src, 'sound/voice/bear_aww.ogg', 100, 1) stance = HOSTILE_STANCE_TIRED stance_step = 0 walk(src, 0) //This stops the bear's walking @@ -126,6 +130,11 @@ if(!Adjacent(target_mob)) return visible_emote(list("slashes at [target_mob]!", "bites [target_mob]!")) + if(prob(66)) + if(prob(50)) + playsound(src, 'sound/voice/bear_roar.ogg', 100, 1) + else + playsound(src, 'sound/voice/bear_growl.ogg', 100, 1) var/damage = rand(20,30) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 1d645d7bfd..b82ca64699 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -88,7 +88,6 @@ new_slime = new /mob/living/carbon/slime(loc) if(adult) new_slime.is_adult = 1 - else new_slime.key = key to_chat(new_slime, "You are now a slime. Skreee!") diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm index 756d2d3f1a..9846593a23 100644 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ b/code/modules/modular_computers/NTNet/NTNet.dm @@ -195,7 +195,7 @@ var/global/datum/ntnet/ntnet_global = new() add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.") if(NTNET_SYSTEMCONTROL) setting_systemcontrol = !setting_systemcontrol - add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name()]'s systems.") + add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name]'s systems.") /datum/ntnet/proc/find_email_by_login(var/login) for(var/datum/computer_file/data/email_account/A in ntnet_global.email_accounts) diff --git a/code/modules/modular_computers/computers/subtypes/preset_pda.dm b/code/modules/modular_computers/computers/subtypes/preset_pda.dm index 26f8ebe1cc..d238c6bce6 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_pda.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_pda.dm @@ -132,6 +132,17 @@ /obj/item/modular_computer/pda/club_worker icon_state = "pda-club" +/obj/item/modular_computer/pda/artist + icon_state = "pda-clown" + +/obj/item/modular_computer/pda/artist/Crossed(AM as mob|obj) //Clown PDA is slippery. + if (isliving(AM)) + var/mob/living/M = AM + if((locate(/obj/structure/multiz/stairs) in get_turf(loc)) || (locate(/obj/structure/multiz/ladder) in get_turf(loc))) + visible_message(SPAN_DANGER("\The [M] carefully avoids stepping down on \the [src].")) + return + M.slip("the PDA",8) + /obj/item/modular_computer/pda/club_worker/install_default_programs() ..() hard_drive.store_file(new /datum/computer_file/program/drink_catalog()) diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 0a50b530af..52be8cd91a 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -28,7 +28,7 @@ var/list/data = host.initial_data() data["src"] = "\ref[src]" - data["station_name"] = station_name() + data["station_name"] = station_name data["manifest"] = html_crew_manifest() data["assignments"] = show_assignments if(program && program.computer) diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 9be2856ebc..35cfb4db24 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -136,7 +136,7 @@ if(announcment_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements") return TRUE - var/input = input(usr, "Please write a message to announce to the [station_name()].", "Priority Announcement") as null|text + var/input = input(usr, "Please write a message to announce to the [station_name].", "Priority Announcement") as null|text if(!input || !can_still_topic()) return 1 if(GLOB.in_character_filter.len) //I don't want to read announcements about sending people to brazil. diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 50f1e6d4a3..46a7fcfce0 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -61,4 +61,3 @@ else //if at least two items remain, just update the bundle icon B.update_icon() to_chat(user, "You add [num_of_pages_added] papers from \the [W] into \the [src].") - return diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 98b6197fdf..5d536e1932 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -9,6 +9,8 @@ anchored = TRUE icon = 'icons/obj/stairs.dmi' bad_type = /obj/structure/multiz + health = 5000 + maxHealth = 5000 var/istop = TRUE var/obj/structure/multiz/target var/obj/structure/multiz/targeted_by diff --git a/code/modules/organs/external/dismemberment.dm b/code/modules/organs/external/dismemberment.dm index 00bf83228a..18a564545d 100644 --- a/code/modules/organs/external/dismemberment.dm +++ b/code/modules/organs/external/dismemberment.dm @@ -54,8 +54,7 @@ dir = 2 switch(disintegrate) - if(DROPLIMB_EDGE, DROPLIMB_EDGE_BURN) - compile_icon() + if(DROPLIMB_EDGE, DROPLIMB_EDGE_BURN) //TODO: IF head cut off, borer actions "stay" in body, camera will be on cut off head, will not be able to be detach. Too Bad! add_blood(victim) var/matrix/M = matrix() M.Turn(rand(180)) @@ -71,6 +70,7 @@ for(var/obj/item/organ/I in internal_organs) I.removed() I.forceMove(get_turf(src)) + I.status |= ORGAN_CUT_AWAY for(var/obj/item/I in src) if(I.volumeClass > ITEM_SIZE_SMALL) @@ -89,7 +89,15 @@ I.removed() I.forceMove(get_turf(src)) I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) + I.status |= ORGAN_CUT_AWAY + for(var/mob/living/I in src) // check for mobs inside you... yeah + if(istype(I, /mob/living/simple_animal/borer/)) + var/mob/living/simple_animal/borer/B = I + B.detach() + B.leave_host() + I.forceMove(get_turf(src)) + I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) for(var/obj/item/I in src) if(I.volumeClass <= ITEM_SIZE_SMALL) qdel(I) diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm index 19a9d27dc9..77987c8377 100644 --- a/code/modules/organs/internal/_internal.dm +++ b/code/modules/organs/internal/_internal.dm @@ -29,12 +29,22 @@ RegisterSignal(src, COMSIG_IORGAN_ADD_WOUND, PROC_REF(add_wound)) RegisterSignal(src, COMSIG_IORGAN_REMOVE_WOUND, PROC_REF(remove_wound)) RegisterSignal(src, COMSIG_IORGAN_REFRESH_SELF, PROC_REF(refresh_upgrades)) + spawn(10) + PostInit() + +/obj/item/organ/internal/proc/PostInit() + if(!get_limb()) + status |= ORGAN_CUT_AWAY /obj/item/organ/internal/Process() refresh_damage() // Death check is in the parent proc ..() handle_blood() +/obj/item/organ/internal/die() + ..() + handle_organ_eff() + /obj/item/organ/internal/Destroy() QDEL_LIST(item_upgrades) for(var/comp in GetComponents(/datum/component/internal_wound)) @@ -85,7 +95,10 @@ for(var/process in organ_efficiency) if(!islist(owner.internal_organs_by_efficiency[process])) owner.internal_organs_by_efficiency[process] = list() - owner.internal_organs_by_efficiency[process] += src + if(is_usable()) + owner.internal_organs_by_efficiency[process] |= src + else + owner.internal_organs_by_efficiency[process] -= src for(var/proc_path in owner_verbs) verbs |= proc_path @@ -93,6 +106,13 @@ if(GetComponent(/datum/component/internal_wound/organic/parenchyma)) owner.mutation_index++ +/obj/item/organ/internal/proc/handle_organ_eff() + for(var/process in organ_efficiency) + if(is_usable()) + owner.internal_organs_by_efficiency[process] |= src + else + owner.internal_organs_by_efficiency[process] -= src + /obj/item/organ/internal/proc/get_process_efficiency(process_define) var/organ_eff = organ_efficiency[process_define] return organ_eff - (organ_eff * (damage / max_damage)) diff --git a/code/modules/organs/internal/carrion.dm b/code/modules/organs/internal/carrion.dm index 590a6cda07..2798d04a58 100644 --- a/code/modules/organs/internal/carrion.dm +++ b/code/modules/organs/internal/carrion.dm @@ -61,7 +61,7 @@ /obj/item/organ/internal/carrion/core/proc/carrion_transform, /obj/item/organ/internal/carrion/core/proc/EvolutionMenu, /obj/item/organ/internal/carrion/core/proc/carrion_fakedeath, - /obj/item/organ/internal/carrion/core/proc/detatch, + /obj/item/organ/internal/carrion/core/proc/detach, /obj/item/organ/internal/carrion/core/proc/make_spider, /obj/item/organ/internal/carrion/core/proc/spider_menu ) @@ -213,9 +213,9 @@ EvolutionMenu() ..() -/obj/item/organ/internal/carrion/core/proc/detatch() +/obj/item/organ/internal/carrion/core/proc/detach() set category = "Carrion" - set name = "Detatch" + set name = "Detach" if(owner.status_flags & FAKEDEATH) to_chat(owner, SPAN_WARNING("We are regenerating our body!")) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index 261a523ae7..d01904a6ee 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -39,7 +39,7 @@ return eyes_color = owner.eyes_color -/obj/item/organ/internal/eyes/take_damage(amount, damage_type = BRUTE, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, silent = FALSE) +/obj/item/organ/internal/eyes/take_damage(amount, damage_type = BRUTE, wounding_multiplier = 1, silent = FALSE, sharp = FALSE, edge = FALSE) var/oldbroken = is_broken() ..() if(is_broken() && !oldbroken && owner && !owner.stat) @@ -51,6 +51,52 @@ else return colourmatrix +/obj/item/organ/internal/eyes/get_possible_wounds(damage_type, sharp, edge) + var/list/possible_wounds = list() + + // Determine possible wounds based on nature and damage type + var/is_robotic = BP_IS_ROBOTIC(src) + var/is_organic = BP_IS_ORGANIC(src) || BP_IS_ASSISTED(src) + + switch(damage_type) + if(BRUTE) + if(!edge) + if(sharp) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/eyes_sharp)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/eyes_sharp)) + else + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/eyes_blunt)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/eyes_blunt)) + else + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/eyes_edge)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/eyes_edge)) + if(BURN) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/eyes_burn)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/eyes_emp_burn)) + if(TOX) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/eyes_poisoning)) + //if(is_robotic) + // LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/eyes_build_up)) + if(CLONE) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/radiation)) + if(PSY) + if(is_organic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/organic/sanity)) + if(is_robotic) + LAZYADD(possible_wounds, subtypesof(/datum/component/internal_wound/robotic/sanity)) + + return possible_wounds + //Subtypes /obj/item/organ/internal/eyes/oneeye icon_state = "eye_l" diff --git a/code/modules/organs/internal/internal_wounds/_internal_wound.dm b/code/modules/organs/internal/internal_wounds/_internal_wound.dm index 0c4b7a6655..e323dedf45 100644 --- a/code/modules/organs/internal/internal_wounds/_internal_wound.dm +++ b/code/modules/organs/internal/internal_wounds/_internal_wound.dm @@ -181,6 +181,9 @@ is_treated = TRUE else is_treated = S.use(charges_needed) + else if(istype(I)) // check for using items without stacks + is_treated = TRUE + qdel(I) if(is_treated) if(free_use) to_chat(user, SPAN_NOTICE("You have managed to waste less [I.name].")) @@ -236,7 +239,7 @@ if(!islist(H.internal_organs_by_efficiency[process])) H.internal_organs_by_efficiency[process] = list() H.internal_organs_by_efficiency[process] |= O - + if(organ_efficiency_multiplier) for(var/organ in O.organ_efficiency) O.organ_efficiency[organ] = round(O.organ_efficiency[organ] * (1 + organ_efficiency_multiplier), 1) diff --git a/code/modules/organs/internal/internal_wounds/brain.dm b/code/modules/organs/internal/internal_wounds/brain.dm new file mode 100644 index 0000000000..c7d4250aed --- /dev/null +++ b/code/modules/organs/internal/internal_wounds/brain.dm @@ -0,0 +1,236 @@ + +// Blunt +/datum/component/internal_wound/organic/brain_blunt + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + severity = 0 + severity_max = 5 + hal_damage = IWOUND_MEDIUM_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE +/datum/component/internal_wound/organic/brain_blunt/contusion + name = "brain contusion" + +/datum/component/internal_wound/organic/brain_blunt/diffuse + name = "diffuse axonal injury" + +/datum/component/internal_wound/organic/brain_blunt/torn + name = "torn nerve fibers" + +// Sharp +/datum/component/internal_wound/organic/brain_sharp + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/organic/swelling + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/organic/brain_sharp/punctured + name = "punctured brain tissue" + +/datum/component/internal_wound/organic/brain_sharp/lobe + name = "gored brain lobe" + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + +/datum/component/internal_wound/organic/brain_sharp/penetrating + name = "penetrating brain injury" + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 4) + treatments_tool = list(QUALITY_LASER_CUTTING = FAILCHANCE_HARD) + scar = list(/datum/component/internal_wound/organic/penetrating2) // stage 2 + +/datum/component/internal_wound/organic/penetrating2 // stage 2 + name = "accessible penetrating brain injury" + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/organic/swelling + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + + +// /datum/component/internal_wound/organic/brain_sharp/gore +// name = "gored frontal lobe" //-- is that the bite of 87???????????????????????? + +// Edge +/datum/component/internal_wound/organic/brain_edge + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/organic/swelling + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/organic/brain_edge/laceration + name = "brain laceration" + +/datum/component/internal_wound/organic/brain_edge/slice + name = "sliced brain tissue" + +/datum/component/internal_wound/organic/brain_edge/rip + name = "ripped brain fibers" + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 4) + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + scar = list(/datum/component/internal_wound/organic/rip2) + +/datum/component/internal_wound/organic/rip2 + name = "tighted ripped brain fibers" + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/organic/swelling + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/* +/datum/component/internal_wound/organic/edge/tear + name = "torn tissue" + +/datum/component/internal_wound/organic/edge/cut + name = "leaking cut" +*/ + +// Burn +/datum/component/internal_wound/organic/brain_burn + treatments_item = list(/obj/item/stack/medical/advanced/ointment = 2) + treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_HARD) + treatments_chem = list(CE_BRAINHEAL = 1) + scar = /datum/component/internal_wound/organic/necrosis_start + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/organic/infection + hal_damage = IWOUND_MEDIUM_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/organic/brain_burn/brain_matter + name = "burnt brain matter" +/datum/component/internal_wound/organic/brain_burn/cooked + name = "well-cooked brain" + treatments_item = list(/obj/item/stack/medical/advanced/ointment = 4) +/datum/component/internal_wound/organic/brain_burn/incinerate + name = "incinerated brain fibers" + +//--------------------------------------------------------------------------------------------- +//----------------------------------------PROSTHETICS------------------------------------------ +//--------------------------------------------------------------------------------------------- + +// Blunt +/datum/component/internal_wound/robotic/brain_blunt + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_HAMMERING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.55) // repair nanites + 3 metals OR repair nanite OD + a metal + severity = 0 + severity_max = 5 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/robotic/brain_blunt/malfunction + name = "damaged neural processor" + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) +/datum/component/internal_wound/robotic/brain_blunt/voxel + name = "voxel matrix deformation" + treatments_tool = list(QUALITY_LASER_CUTTING = FAILCHANCE_HARD) +/datum/component/internal_wound/robotic/brain_blunt/loose + name = "loose calculation coupling" + treatments_tool = list(QUALITY_HAMMERING = FAILCHANCE_HARD) + + +/* +/datum/component/internal_wound/robotic/blunt/bent + name = "bent structure" + +/datum/component/internal_wound/robotic/blunt/crack + name = "cracked frame" +*/ + +// Sharp +/datum/component/internal_wound/robotic/brain_sharp + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.85) + severity = 0 + severity_max = 5 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/robotic/brain_sharp/puncture + name = "punctured structure" + +/datum/component/internal_wound/robotic/brain_sharp/shell + name = "wrecked brain shell" + treatments_tool = list(QUALITY_WELDING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/brain_sharp/nand1 + name = "broken NAND circuit loop" + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + scar = /datum/component/internal_wound/robotic/nand2 + +/datum/component/internal_wound/robotic/nand2 + name = "broken NAND circuit loop" + treatments_tool = list(QUALITY_PULSING = FAILCHANCE_HARD) + +// Edge +/datum/component/internal_wound/robotic/brain_edge + treatments_item = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.85) + severity = 0 + severity_max = 5 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/robotic/brain_edge/trimmed + name = "trimmed down VRAM" + treatments_tool = list(QUALITY_WELDING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/brain_edge/disheveled + name = "cut fiber-optic cord" + treatments_tool = list(QUALITY_BOLT_TURNING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/brain_edge/shred1 + name = "scrapped bracing" + treatments_tool = list(QUALITY_PRYING = FAILCHANCE_HARD) + scar = /datum/component/internal_wound/robotic/shred2 + +/datum/component/internal_wound/robotic/shred2 + name = "scrapped bracing" + treatments_tool = list(QUALITY_WELDING = FAILCHANCE_HARD) + +/* +/datum/component/internal_wound/robotic/edge/short + name = "electrical short" + +/datum/component/internal_wound/robotic/edge/arc + name = "arcing" +*/ + +// EMP/burn wounds +/datum/component/internal_wound/robotic/brain_emp_burn + treatments_item = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.95) // repair nanite OD + all metals + severity = 0 + severity_max = 5 + next_wound = /datum/component/internal_wound/robotic/overheat + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + characteristic_flag = IWOUND_HALLUCINATE + +/datum/component/internal_wound/robotic/brain_emp_burn/elec_malfunction + name = "electrical malfunction" + treatments_tool = list(QUALITY_PULSING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/brain_emp_burn/cognitive_disorder + name = "cognitive circuit disorder" + treatments_tool = list(QUALITY_CAUTERIZE = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/brain_emp_burn/upturned + name = "upturned memory stack" + treatments_tool = list(QUALITY_PRYING = FAILCHANCE_HARD) // gotta put it the way it was! diff --git a/code/modules/organs/internal/internal_wounds/eyes.dm b/code/modules/organs/internal/internal_wounds/eyes.dm new file mode 100644 index 0000000000..78da8a5633 --- /dev/null +++ b/code/modules/organs/internal/internal_wounds/eyes.dm @@ -0,0 +1,246 @@ +// Blunt +/datum/component/internal_wound/organic/eyes_blunt + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + treatments_chem = list(CE_EYEHEAL = 1) + severity = 0 + severity_max = 3 // with 3 health it takes around 3 wounds to kill eyes + hal_damage = IWOUND_MEDIUM_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/organic/eyes_blunt/dissection + name = "retinal dissection" + +/datum/component/internal_wound/organic/eyes_blunt/erosion //PAINFUL + name = "corneal erosion" + hal_damage = IWOUND_HEAVY_DAMAGE + +/datum/component/internal_wound/organic/eyes_blunt/iris //iris hehehehe + name = "iris tears" + +// Sharp + +/datum/component/internal_wound/organic/eyes_sharp + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_LASER_CUTTING = FAILCHANCE_HARD) + treatments_chem = list(CE_EYEHEAL = 1) + severity = 0 + severity_max = 3 + hal_damage = IWOUND_MEDIUM_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/organic/eyes_sharp/cataract + name = "traumatic cataract" + +/datum/component/internal_wound/organic/eyes_sharp/perforation + name = "superonasal perforation" + +/datum/component/internal_wound/organic/eyes_sharp/matter + name = "foreign matter" + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + +// Edge +/datum/component/internal_wound/organic/eyes_edge + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 2) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_EYEHEAL = 1) + severity = 0 + severity_max = 3 + hal_damage = IWOUND_MEDIUM_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/organic/eyes_edge/laceration + name = "globe laceration" + +/datum/component/internal_wound/organic/eyes_edge/retina + name = "cut retina" + +/datum/component/internal_wound/organic/eyes_edge/slice + name = "sliced vascular layer" + +// Burn + +/datum/component/internal_wound/organic/eyes_burn + treatments_item = list(/obj/item/stack/medical/advanced/ointment = 2) + treatments_tool = list(QUALITY_LASER_CUTTING = FAILCHANCE_HARD) + treatments_chem = list(CE_EYEHEAL = 1) + scar = /datum/component/internal_wound/organic/necrosis_start + severity = 0 + severity_max = 3 + next_wound = /datum/component/internal_wound/organic/infection + hal_damage = IWOUND_MEDIUM_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/organic/eyes_burn/burnt + name = "burnt external fibrous layer" + +/datum/component/internal_wound/organic/eyes_burn/char + name = "charred sclera" + +/datum/component/internal_wound/organic/eyes_burn/scorch + name = "scorched deep tissue" + treatments_tool = list(QUALITY_RETRACTING = FAILCHANCE_HARD) + scar = /datum/component/internal_wound/organic/eyes_deep_burn + +/datum/component/internal_wound/organic/eyes_deep_burn/stage2 //stage 2 + name = "scorched deep tissue" + treatments_item = list(/obj/item/stack/medical/advanced/ointment = 2) + treatments_chem = list(CE_EYEHEAL = 1) + severity = 3 //starting at max damage because stage 2 + severity_max = 3 + hal_damage = IWOUND_HEAVY_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +// Tox (toxins) +/datum/component/internal_wound/organic/eyes_poisoning + treatments_item = list(/obj/item/stack/medical/advanced/bruise_pack = 1) + treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_HARD) + treatments_chem = list(CE_ANTITOX = 2) + severity = 0 + severity_max = 3 + hal_damage = IWOUND_LIGHT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/// Cheap hack, but prevents unbalanced toxins from killing someone immediately +/datum/component/internal_wound/organic/eyes_poisoning/InheritComponent() + if(prob(5)) + progress() + +/datum/component/internal_wound/organic/eyes_poisoning/pustule + name = "vitreous pustule" + specific_organ_size_multiplier = 0.20 + +/datum/component/internal_wound/organic/eyes_poisoning/intoxication + name = "sclera intoxication" + blood_req_multiplier = 0.25 + nutriment_req_multiplier = 0.25 + oxygen_req_multiplier = 0.25 + +/datum/component/internal_wound/organic/eyes_poisoning/accumulation + name = "lens foreign accumulation" + hal_damage = IWOUND_MEDIUM_DAMAGE + +/// Robotic + +// Blunt +/datum/component/internal_wound/robotic/eyes_blunt + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_SCREW_DRIVING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.55) // repair nanites + 3 metals OR repair nanite OD + a metal + severity = 0 + severity_max = 3 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_blunt/lense + name = "misplaced lense" + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/eyes_blunt/jam + name = "jammed mechanics" + +/datum/component/internal_wound/robotic/eyes_blunt/matrix + name = "disconnected matrix" + organ_efficiency_multiplier = -1 // can't see anything because of loose wire + +// Sharp + +/datum/component/internal_wound/robotic/eyes_sharp + treatments_item = list(/obj/item/stack/nanopaste = 2) + treatments_tool = list() + treatments_chem = list(CE_MECH_REPAIR = 0.85) // repair nanites + 6 metals OR repair nanite OD + 7 metals + severity = 0 + severity_max = 3 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_sharp/prism + name = "fractured prism" + treatments_tool = list(QUALITY_ADHESIVE = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/eyes_sharp/shatter + name = "shattered thin-film transistor" + treatments_chem = list(CE_MECH_REPAIR = 0.20) + +/datum/component/internal_wound/robotic/eyes_sharp/failure + name = "mechanical matrix failure" + treatments_item = list(/obj/item/stock_parts/scanning_module = 1, /obj/item/stack/nanopaste = 2) + +// Edge +/datum/component/internal_wound/robotic/eyes_edge + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_CAUTERIZING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.85) + severity = 0 + severity_max = 3 + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_edge/ocular + name = "scratched ocular" + +/datum/component/internal_wound/robotic/eyes_edge/focuser + name = "torn focuser" + +/datum/component/internal_wound/robotic/eyes_edge/slice + name = "sliced open optical cord" + treatments_item = list(/obj/item/stack/cable_coil = 5) + +// EMP/burn wounds + +/datum/component/internal_wound/robotic/eyes_emp_burn + treatments_item = list(/obj/item/stack/cable_coil = 5) + treatments_tool = list(QUALITY_WIRE_CUTTING = FAILCHANCE_HARD) + treatments_chem = list(CE_MECH_REPAIR = 0.95) // repair nanite OD + all metals + severity = 0 + severity_max = 3 + next_wound = /datum/component/internal_wound/robotic/eyes_overheat + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_emp_burn/pixels + name = "burnt matrix pixels" + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_tool = list(QUALITY_PULSING = FAILCHANCE_HARD) + +/datum/component/internal_wound/robotic/eyes_emp_burn/inverse + name = "inversed movement axis" + treatments_tool = list(QUALITY_SCREW_DRIVING = FAILCHANCE_HARD) +/datum/component/internal_wound/robotic/eyes_emp_burn/carbonized + name = "mangled wiring" + +/datum/component/internal_wound/robotic/eyes_overheat + treatments_item = list(/obj/item/stack/cable_coil = 10, /obj/item/stack/nanopaste = 2) + treatments_chem = list(CE_MECH_STABLE = 0.5) // coolant or refrigerant + severity = 0 + severity_max = IORGAN_MAX_HEALTH + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_overheat/standard + name = "overheating link" + +/datum/component/internal_wound/robotic/eyes_overheat/alt + name = "thermal blackout" + organ_efficiency_multiplier = -1 + +// Tox - UNUSED +/datum/component/internal_wound/robotic/eyes_build_up + treatments_tool = list(QUALITY_CLAMPING = FAILCHANCE_HARD) // Clear any clog wtih a thin tool + treatments_chem = list(CE_MECH_ACID = 1) // sulphiric acid + severity = 0 + severity_max = 3 + next_wound = /datum/component/internal_wound/robotic/corrosion + hal_damage = IWOUND_INSIGNIFICANT_DAMAGE + diagnosis_difficulty = STAT_LEVEL_EXPERT + +/datum/component/internal_wound/robotic/eyes_build_up/breach + name = "breached bioisolation" + treatments_tool = list(QUALITY_ADHESIVE = FAILCHANCE_HARD) + treatments_item = list(/obj/item/stack/nanopaste = 1) + treatments_chem = list(CE_MECH_REPAIR = 0.30) + +/datum/component/internal_wound/robotic/eyes_build_up/clog + name = "clogged circuitry" + severity_max = 5 + hal_damage = IWOUND_MEDIUM_DAMAGE diff --git a/code/modules/organs/internal/internal_wounds/organic.dm b/code/modules/organs/internal/internal_wounds/organic.dm index 8993c85129..d9189fc337 100644 --- a/code/modules/organs/internal/internal_wounds/organic.dm +++ b/code/modules/organs/internal/internal_wounds/organic.dm @@ -138,7 +138,7 @@ treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_NORMAL) treatments_chem = list(CE_ANTITOX = 2) severity = 0 - severity_max = 3 + severity_max = 4 hal_damage = IWOUND_LIGHT_DAMAGE /// Cheap hack, but prevents unbalanced toxins from killing someone immediately diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 8a0a77d396..5c524de1a7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -34,8 +34,6 @@ var/list/ico[0] //Icons and var/list/offset_x[0] //offsets stored for later var/list/offset_y[0] //usage by the photocopier - var/rigged = 0 - var/spam_flag = 0 var/crumpled = FALSE var/const/deffont = "Verdana" @@ -115,12 +113,6 @@ crumpled = TRUE return user.examinate(src) - if(rigged && (Holiday == "April Fool's Day")) - if (spam_flag == 0) - spam_flag = 1 - playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) - spawn(20) - spam_flag = 0 /obj/item/paper/attack_ai(var/mob/living/silicon/ai/user) show_content(user) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index a0bbc2148e..4361b43711 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -58,11 +58,6 @@ else if(response == "Regular") P = new /obj/item/paper - if(Holiday == "April Fool's Day") - if(prob(30)) - P.info = "HONK HONK HONK HONK HONK HONK HONK HOOOOOOOOOOOOOOOOOOOOOONK APRIL FOOLS" - P.rigged = 1 - P.updateinfolinks() else if (response == "Carbon-Copy") P = new /obj/item/paper/carbon diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 75ecf28de3..0824dd1183 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -47,6 +47,14 @@ name = "guild merchant's stamp" icon_state = "stamp-qm" +/obj/item/stamp/nt + name = "neotheology preacher's stamp" + icon_state = "stamp-nt" + +/obj/item/stamp/lus + name = "luscent official's stamp" + icon_state = "stamp-lus" + // Syndicate stamp to forge documents. /obj/item/stamp/chameleon/attack_self(mob/user as mob) diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 53f4d5875f..0cb5153a90 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -12,7 +12,6 @@ output_level = 0 input_level_max = 0 output_level_max = 0 - icon_state = "mpsu_closed" circuit = /obj/item/electronics/circuitboard/batteryrack var/cells_amount = 0 var/capacitors_amount = 0 @@ -50,7 +49,7 @@ input.forceMove(get_turf(user)) user.put_in_active_hand(input) -/obj/machinery/power/smes/batteryrack/Topic(href, href_list) +/obj/machinery/power/smes/batteryrack/Topic(href, href_list)// May be better to strip this completely as it currently is, force a reconstruction for cell removal. /// For any UI related fuckery to NanoUI/Tgui . = ..() if(QDELETED(src)) @@ -74,6 +73,8 @@ component_parts.Remove(battery) battery.forceMove(get_turf(target)) target.put_in_active_hand(battery) + RefreshParts() + update_icon() /obj/machinery/power/smes/batteryrack/Initialize(mapload, d) . = ..() @@ -137,13 +138,7 @@ if (charge < (capacity / 100) || capacity == 0) if (!output_attempt && !input_attempt) playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) - var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) - M.state = 2 - M.icon_state = "box_1" - for(var/obj/I in component_parts) - I.forceMove(get_turf(src)) - qdel(src) - return 1 + dismantle() else to_chat(user, SPAN_WARNING("Turn off the [src] before dismantling it.")) else diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index ddcac201df..41d9e6c882 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -41,7 +41,7 @@ anchored = FALSE light_range = 4 - price_tag = 10000 + price_tag = 20000 var/gasefficency = 0.25 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 7cc2fecc8a..2b0f985aef 100755 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -59,65 +59,27 @@ /// special case where is the location is specified as a ammo_Casing , it will clone all relevant vars /obj/item/ammo_casing/New(loc, ...) - . = ..() if(istype(loc, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = loc - name = C.name - desc = C.desc - caliber = C.caliber - projectile_type = C.projectile_type - icon_state = C.icon_state - spent_icon = C.spent_icon - maxamount = C.maxamount - if(ispath(projectile_type) && C.BB) - BB = new projectile_type(src) - - sprite_use_small = C.sprite_use_small - sprite_max_rotate = C.sprite_max_rotate - sprite_scale = C.sprite_scale - sprite_update_spawn = C.sprite_update_spawn - - if(sprite_update_spawn) - var/matrix/rotation_matrix = matrix() - rotation_matrix.Turn(round(45 * rand(0, sprite_max_rotate) / 2)) - if(sprite_use_small) - transform = rotation_matrix * sprite_scale - else - transform = rotation_matrix - - is_caseless = C.is_caseless //How did someone forget this before!?!?!? - shell_color = C.shell_color + src.amount = 1 // otherwise duplicating the type will make Type/Prespawned start with too large an amount + if(!C.BB) + projectile_type = FALSE // this prevents spent projectiles resetting their status- this is safe because it typechecks for path, and this is not path C.update_icon() update_icon() + . = ..() /obj/item/ammo_casing/attack_hand(mob/user) if((src.amount > 1) && (src == user.get_inactive_hand())) src.amount -= 1 - var/obj/item/ammo_casing/new_casing = new /obj/item/ammo_casing(src) + var/obj/item/ammo_casing/new_casing = new src.type(src) new_casing.forceMove(get_turf(user)) user.put_in_active_hand(new_casing) else return ..() /obj/item/ammo_casing/attackby(obj/item/I, mob/user) - if(I.get_tool_type(usr, list(QUALITY_SCREW_DRIVING, QUALITY_CUTTING), src)) - if(!BB) - to_chat(user, SPAN_NOTICE("There is no bullet in the casing to inscribe anything into.")) - return - - var/tmp_label = "" - var/label_text = sanitizeSafe(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label), MAX_NAME_LEN) - if(length(label_text) > 20) - to_chat(user, SPAN_WARNING("The inscription can be at most 20 characters long.")) - else if(!label_text) - to_chat(user, SPAN_NOTICE("You scratch the inscription off of [initial(BB)].")) - BB.name = initial(BB.name) - else - to_chat(user, SPAN_NOTICE("You inscribe \"[label_text]\" into \the [initial(BB.name)].")) - BB.name = "[initial(BB.name)] (\"[label_text]\")" - return TRUE - else if(istype(I, /obj/item/ammo_casing)) + if(istype(I, /obj/item/ammo_casing)) var/obj/item/ammo_casing/merging_casing = I if(isturf(src.loc)) if(merging_casing.amount == merging_casing.maxamount) @@ -133,11 +95,7 @@ return FALSE if(!user && noMessage == FALSE) error("Passed no user to mergeCasing() when output messages is active.") - if(src.caliber != AC.caliber) - if(!noMessage) - to_chat(user, SPAN_WARNING("Ammo are different calibers.")) - return FALSE - if(src.projectile_type != AC.projectile_type) + if(src.type != AC.type) if(!noMessage) to_chat(user, SPAN_WARNING("Ammo are different types.")) return FALSE @@ -196,6 +154,16 @@ /obj/item/ammo_casing/get_item_cost(export) . = round(..() * amount) + if(BB) + . *= 2 // being loaded increases the value by 100% + +/obj/item/ammo_casing/get_matter() + . = matter?.Copy() // return starts at default matter + if(isnull(.)) // if the casing is matterless, handling is pointless. + return + else if(amount > 1) // if there is only one, there is no need to multiply + for(var/mattertype in .) + .[mattertype] *= amount // multiply matter appropriately //An item that holds casings and can be used to put them inside guns /obj/item/ammo_magazine @@ -353,7 +321,7 @@ if(C.amount > 1) C.amount -= 1 - var/obj/item/ammo_casing/inserted_casing = new /obj/item/ammo_casing(C) + var/obj/item/ammo_casing/inserted_casing = new C.type(C) stored_ammo.Insert(1, inserted_casing) else if(ismob(C.loc)) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 04df517593..6370bd5045 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -42,7 +42,7 @@ /obj/item/ammo_magazine/ammobox/pistol name = "ammunition packet (.35 Auto)" icon_state = "pistol" - matter = list(MATERIAL_STEEL = 10, MATERIAL_CARDBOARD = 1) + matter = list(MATERIAL_CARDBOARD = 1) // the autofill increases the cost depending on the contents caliber = CAL_PISTOL ammo_type = /obj/item/ammo_casing/pistol max_ammo = 70 @@ -69,7 +69,7 @@ /obj/item/ammo_magazine/ammobox/magnum name = "ammunition packet (.40 Magnum)" icon_state = "magnum" - matter = list(MATERIAL_STEEL = 10, MATERIAL_CARDBOARD = 1) + matter = list(MATERIAL_CARDBOARD = 1) caliber = CAL_MAGNUM ammo_type = /obj/item/ammo_casing/magnum max_ammo = 50 @@ -108,7 +108,7 @@ /obj/item/ammo_magazine/ammobox/srifle_small name = "ammunition packet (.20 Rifle)" icon_state = "srifle" - matter = list(MATERIAL_STEEL = 10, MATERIAL_CARDBOARD = 1) + matter = list(MATERIAL_CARDBOARD = 1) caliber = CAL_SRIFLE ammo_type = /obj/item/ammo_casing/srifle max_ammo = 50 @@ -149,7 +149,7 @@ /obj/item/ammo_magazine/ammobox/clrifle_small name = "ammunition packet (.25 Caseless Rifle)" icon_state = "clrifle" - matter = list(MATERIAL_STEEL = 10, MATERIAL_CARDBOARD = 1) + matter = list(MATERIAL_CARDBOARD = 1) caliber = CAL_CLRIFLE ammo_type = /obj/item/ammo_casing/clrifle max_ammo = 60 @@ -187,7 +187,7 @@ /obj/item/ammo_magazine/ammobox/lrifle_small name = "ammunition packet (.30 Rifle)" icon_state = "lrifle" - matter = list(MATERIAL_STEEL = 10, MATERIAL_CARDBOARD = 1) + matter = list(MATERIAL_CARDBOARD = 1) caliber = CAL_LRIFLE ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 60 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 08b1a14db9..04d546ec4e 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -12,6 +12,7 @@ sprite_update_spawn = TRUE sprite_max_rotate = 32 sprite_scale = 0.5 + matter = list(MATERIAL_STEEL = 0.05) /obj/item/ammo_casing/pistol/hv desc = "A .35 Auto high-velocity bullet casing." @@ -62,6 +63,7 @@ sprite_update_spawn = TRUE sprite_max_rotate = 32 sprite_scale = 0.5 + matter = list(MATERIAL_STEEL = 0.15) /obj/item/ammo_casing/magnum/practice desc = "A .40 Magnum practice bullet casing." @@ -112,6 +114,7 @@ sprite_update_spawn = TRUE sprite_max_rotate = 32 sprite_scale = 0.5 + matter = list(MATERIAL_STEEL = 0.1) /obj/item/ammo_casing/srifle/practice desc = "A .20 Rifle practice bullet casing." @@ -157,7 +160,7 @@ shell_color = "l" caliber = CAL_CLRIFLE projectile_type = /obj/item/projectile/bullet/clrifle - is_caseless = TRUE + is_caseless = TRUE // as it is caseless, the casing costs nothing. maxamount = 10 commonLore = "Caseless ammunitions were invented during the Syndicate-NT era.They were employed by both sides for operations requiring complete stealth." @@ -217,6 +220,7 @@ sprite_update_spawn = TRUE sprite_max_rotate = 32 sprite_scale = 0.5 + matter = list(MATERIAL_STEEL = 0.15) /obj/item/ammo_casing/lrifle/practice desc = "A .30 rifle practice bullet casing." @@ -262,7 +266,7 @@ spent_icon = "atmr-spent" caliber = CAL_ANTIM projectile_type = /obj/item/projectile/bullet/antim - matter = list(MATERIAL_PLASTEEL = 2) + matter = list(MATERIAL_PLASTEEL = 1) maxamount = 5 sprite_update_spawn = TRUE @@ -278,7 +282,7 @@ icon_state = "atmr-emp" spent_icon = "atmr-emp-spent" projectile_type = /obj/item/projectile/bullet/antim/emp - matter = list(MATERIAL_STEEL = 1, MATERIAL_IRON = 1, MATERIAL_URANIUM = 1) + // bullet contains the iron and uranium /obj/item/ammo_casing/antim/emp/prespawned amount = 5 @@ -289,7 +293,7 @@ icon_state = "atmr-DU" spent_icon = "atmr-DU-spent" projectile_type = /obj/item/projectile/bullet/antim/uranium - matter = list(MATERIAL_STEEL = 1, MATERIAL_URANIUM = 1) + // bullet contains the uranium /obj/item/ammo_casing/antim/uranium/prespawned amount = 5 @@ -300,7 +304,6 @@ icon_state = "atmr-HE" spent_icon = "atmr-HE-spent" projectile_type = /obj/item/projectile/bullet/antim/breach - matter = list(MATERIAL_PLASTEEL = 1, MATERIAL_URANIUM = 1) /obj/item/ammo_casing/antim/breach/prespawned amount = 5 @@ -327,7 +330,7 @@ shell_color = "hv" caliber = CAL_SHOTGUN projectile_type = /obj/item/projectile/bullet/shotgun - matter = list(MATERIAL_STEEL = 1) + matter = list(MATERIAL_STEEL = 0.5) maxamount = 5 price_tag = 1 @@ -359,7 +362,6 @@ spent_icon = "s-shell_r-spent" shell_color = "r" projectile_type = /obj/item/projectile/bullet/shotgun/beanbag - matter = list(MATERIAL_STEEL = 1) /obj/item/ammo_casing/shotgun/beanbag/prespawned amount = 5 @@ -371,7 +373,6 @@ spent_icon = "s-shell_rs-spent" shell_color = "scrap_r" projectile_type = /obj/item/projectile/bullet/shotgun/beanbag/scrap - matter = list(MATERIAL_STEEL = 1) /obj/item/ammo_casing/shotgun/beanbag/scrap/prespawned amount = 5 @@ -383,7 +384,6 @@ spent_icon = "s-shell_l-spent" shell_color = "l" projectile_type = /obj/item/projectile/bullet/pellet/shotgun - matter = list(MATERIAL_STEEL = 1) /obj/item/ammo_casing/shotgun/pellet/prespawned amount = 5 @@ -406,7 +406,6 @@ spent_icon = "s-shell_b-spent" shell_color = "b" projectile_type = /obj/item/projectile/bullet/blank - matter = list(MATERIAL_STEEL = 1) /obj/item/ammo_casing/shotgun/blank/prespawned amount = 5 @@ -418,7 +417,6 @@ spent_icon = "s-shell_p-spent" shell_color = "p" projectile_type = /obj/item/projectile/bullet/shotgun/practice - matter = list(MATERIAL_STEEL = 1) /obj/item/ammo_casing/shotgun/practice/prespawned amount = 5 @@ -431,7 +429,8 @@ spent_icon = "s-shell_f-spent" shell_color = "f" projectile_type = /obj/item/projectile/energy/flash/flare - matter = list(MATERIAL_STEEL = 1, MATERIAL_SILVER = 0.5) + matter = list(MATERIAL_STEEL = 0.5)// silver is inside projectile + /obj/item/ammo_casing/shotgun/flash/prespawned amount = 5 @@ -443,7 +442,7 @@ spent_icon = "s-shell_i-spent" shell_color = "i" projectile_type = /obj/item/projectile/bullet/shotgun/incendiary - matter = list(MATERIAL_STEEL = 1, MATERIAL_PLASMA = 0.5) + matter = list(MATERIAL_STEEL = 0.5) // plasma cost is inside projectile /obj/item/ammo_casing/shotgun/incendiary/prespawned amount = 5 @@ -530,7 +529,7 @@ description_info = "Relying purely on explosive power, HE shells provide the biggest boom on the best budget." icon_state = "rocketshell" projectile_type = /obj/item/projectile/bullet/rocket - matter = list(MATERIAL_STEEL = 3, MATERIAL_PLASTEEL = 3, MATERIAL_PLASMA = 2) + caliber = CAL_ROCKET maxamount = 1 reload_delay = 15 @@ -542,7 +541,6 @@ desc = "An old improvised rocket shell for the RPG-7 launcher. Has a tubular shape." icon_state = "old_rocketshell" projectile_type = /obj/item/projectile/bullet/rocket/scrap - matter = list(MATERIAL_STEEL = 2, MATERIAL_PLASMA = 2) /obj/item/ammo_casing/rocket/hesh name = "PG-7V2 HESH grenade" @@ -594,7 +592,7 @@ icon_state = "f-shell" spent_icon = "f-shell-spent" projectile_type = /obj/item/projectile/bullet/flare - matter = list(MATERIAL_PLASTIC = 1, MATERIAL_PLASMA = 1) + matter = list(MATERIAL_PLASTIC = 0.5) // plasma cost is inside projectile, which does not embed. matter_reagents = list("phosphorus" = 3) rarity_value = 8 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 9465c22a43..c249168b06 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -166,7 +166,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_RIFLE caliber = CAL_SRIFLE - matter = list(MATERIAL_STEEL = 6) + matter = list(MATERIAL_STEEL = 4) ammo_type = /obj/item/ammo_casing/srifle max_ammo = 25 ammo_states = list(25) @@ -203,7 +203,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_RIFLE_L caliber = CAL_SRIFLE - matter = list(MATERIAL_STEEL = 9) + matter = list(MATERIAL_STEEL = 6) ammo_type = /obj/item/ammo_casing/srifle max_ammo = 35 ammo_states = list(35) @@ -236,7 +236,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_RIFLE_D caliber = CAL_SRIFLE - matter = list(MATERIAL_STEEL = 18) + matter = list(MATERIAL_STEEL = 9) ammo_type = /obj/item/ammo_casing/srifle max_ammo = 60 ammo_states = list(60) @@ -313,7 +313,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_BOX caliber = CAL_CLRIFLE - matter = list(MATERIAL_STEEL = 16) + matter = list(MATERIAL_STEEL = 8) ammo_type = /obj/item/ammo_casing/clrifle max_ammo = 80 volumeClass = ITEM_SIZE_NORMAL @@ -326,7 +326,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_PISTOL ammo_type = /obj/item/ammo_casing/clrifle - matter = list(MATERIAL_STEEL = 4) + matter = list(MATERIAL_STEEL = 2) caliber = CAL_CLRIFLE max_ammo = 10 ammo_states = list(2, 4, 6, 8, 10) @@ -351,7 +351,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_RIFLE caliber = CAL_LRIFLE - matter = list(MATERIAL_STEEL = 5) + matter = list(MATERIAL_STEEL = 4) ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 30 ammo_states = list(30) @@ -380,7 +380,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_BOX caliber = CAL_LRIFLE - matter = list(MATERIAL_STEEL = 16) + matter = list(MATERIAL_STEEL = 8) ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 80 volumeClass = ITEM_SIZE_NORMAL @@ -395,7 +395,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_RIFLE_D caliber = CAL_LRIFLE - matter = list(MATERIAL_STEEL = 10) + matter = list(MATERIAL_STEEL = 6) ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 45 ammo_states = list(45) @@ -437,7 +437,7 @@ mag_type = MAGAZINE mag_well = MAG_WELL_PAN caliber = CAL_LRIFLE - matter = list(MATERIAL_STEEL = 20) + matter = list(MATERIAL_STEEL = 10) ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 96 volumeClass = ITEM_SIZE_NORMAL @@ -454,7 +454,7 @@ icon = 'icons/obj/ammo_speed.dmi' icon_state = "slpistol_base" caliber = CAL_PISTOL - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) ammo_type = /obj/item/ammo_casing/pistol max_ammo = 6 rarity_value = 6.66 @@ -494,7 +494,7 @@ icon_state = "slmagnum_base" caliber = CAL_MAGNUM ammo_type = /obj/item/ammo_casing/magnum - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) max_ammo = 6 spawn_tags = SPAWN_TAG_AMMO_IH rarity_value = 5 @@ -536,7 +536,7 @@ icon_state = "lrifle" modular_sprites = FALSE caliber = CAL_LRIFLE - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) ammo_type = /obj/item/ammo_casing/lrifle max_ammo = 5 volumeClass = ITEM_SIZE_TINY @@ -558,7 +558,7 @@ icon = 'icons/obj/ammo_speed.dmi' icon_state = "stripper_base" caliber = CAL_SRIFLE - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) ammo_type = /obj/item/ammo_casing/srifle max_ammo = 6 volumeClass = ITEM_SIZE_TINY @@ -594,7 +594,7 @@ icon = 'icons/obj/ammo_speed.dmi' icon_state = "slsrifle_base" caliber = CAL_SRIFLE - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) ammo_type = /obj/item/ammo_casing/srifle max_ammo = 8 volumeClass = ITEM_SIZE_TINY @@ -628,7 +628,7 @@ icon = 'icons/obj/ammo_speed.dmi' icon_state = "clrifle_base" caliber = CAL_CLRIFLE - matter = list(MATERIAL_STEEL = 3) + matter = list(MATERIAL_STEEL = 1) ammo_type = /obj/item/ammo_casing/clrifle max_ammo = 5 volumeClass = ITEM_SIZE_TINY diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6734ec6a13..169ee8b4e2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -251,7 +251,6 @@ else item_state_slots[slot_l_hand_str] = "lefthand" + state item_state_slots[slot_r_hand_str] = "righthand" + state - state = initial(state) var/carry_state = inversed_carry if(back && !carry_state) @@ -271,7 +270,7 @@ item_state_slots[slot_r_hand_str] = "righthand" + wielded_item_state else item_state_slots[slot_l_hand_str] = "lefthand" - item_state_slots[slot_r_hand_str] = "righthand" + item_state_slots[slot_r_hand_str] = "righthand" else//Otherwise we can just pull from the generic left and right hand icons. if(wielded_icon) item_state_slots[slot_l_hand_str] = wielded_item_state diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 6b048d1740..b602251787 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -105,7 +105,7 @@ for(var/obj/item/ammo_casing/temp_casing in chambered.loc) if(temp_casing == chambered) continue - if((temp_casing.desc == chambered.desc) && !temp_casing.BB) + if((temp_casing.type == chambered.type) && !temp_casing.BB) var/temp_amount = temp_casing.amount + chambered.amount if(temp_amount > chambered.maxamount) temp_casing.amount -= (chambered.maxamount - chambered.amount) @@ -217,7 +217,7 @@ if(C.amount > 1) C.amount -= 1 - var/obj/item/ammo_casing/inserted_casing = new /obj/item/ammo_casing(C) //Couldn't make it seperate, so it must be cloned + var/obj/item/ammo_casing/inserted_casing = new C.type(C) //Couldn't make it seperate, so it must be cloned loaded.Insert(1, inserted_casing) else user.remove_from_mob(C) diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 450620456a..b3ec78da8b 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -11,6 +11,7 @@ kill_count = 15 //shorter range muzzle_type = null var/reagent_amount = 15 + matter = list(MATERIAL_GLASS = 0.2) /obj/item/projectile/bullet/chemdart/New() create_reagents(reagent_amount) @@ -27,10 +28,9 @@ desc = "A small hardened, hollow dart." icon_state = "dart" caliber = CAL_DART + is_caseless = TRUE projectile_type = /obj/item/projectile/bullet/chemdart -/obj/item/ammo_casing/chemdart/expend() - qdel(src) /obj/item/ammo_magazine/chemdart name = "dart cartridge" diff --git a/code/modules/projectiles/guns/projectile/modular.dm b/code/modules/projectiles/guns/projectile/modular.dm index 8e48576b17..2456d3196f 100644 --- a/code/modules/projectiles/guns/projectile/modular.dm +++ b/code/modules/projectiles/guns/projectile/modular.dm @@ -143,7 +143,6 @@ else item_state_slots[slot_l_hand_str] = "lefthand" + state item_state_slots[slot_r_hand_str] = "righthand" + state - state = initial(state) var/carry_state = inversed_carry if(back && !carry_state) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index d2b9aecc97..6e2dd353de 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -281,7 +281,6 @@ GLOBAL_LIST(projectileDamageConstants) setup_trajectory(curloc, targloc, x_offset, y_offset, angle_offset) //plot the initial trajectory Process() - START_PROCESSING(SSprojectiles, src) return FALSE @@ -530,9 +529,13 @@ GLOBAL_LIST(projectileDamageConstants) else passthrough = (A.bullet_act(src, def_zone) == PROJECTILE_CONTINUE) //backwards compatibility if(isturf(A)) - for(var/obj/O in A) + if(QDELETED(src)) // we don't want bombs to explode once for every time bullet_act is called + on_impact(A) + invisibility = 101 + return TRUE // see that next line? it can overload the server. + for(var/obj/O in A) // if src's bullet act spawns more objs, the list will increase, if(O.density) - O.bullet_act(src) + O.bullet_act(src) // causing exponential growth due to the spawned obj spawning itself for(var/mob/living/M in A) attack_mob(M) @@ -731,6 +734,17 @@ GLOBAL_LIST(projectileDamageConstants) return damageTotal > 0 ? (damageLeft / damageTotal) :0 +/obj/item/projectile/get_matter() + . = matter?.Copy() + if(isnull(.)) // empty bullets have no need for matter handling + return + if(istype(loc, /obj/item/ammo_casing)) // if this is part of a stack + var/obj/item/ammo_casing/case = loc + if(case.amount > 1) // if there is only one, there is no need to multiply + for(var/mattertype in .) + .[mattertype] *= case.amount + + //"Tracing" projectile /obj/item/projectile/test //Used to see if you can hit them. invisibility = 101 //Nope! Can't see me! diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 4b433a3c36..4c6ab0fa92 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -96,6 +96,12 @@ var/spread_step = 10 //higher means the pellets spread more across body parts with distance var/pellet_to_knockback_ratio = 0 wounding_mult = WOUNDING_SMALL + matter = list(MATERIAL_STEEL = 0.4) + +/obj/item/projectile/bullet/pellet/launch_from_gun(atom/target, mob/user, obj/item/gun/launcher, target_zone, x_offset=0, y_offset=0, angle_offset) + for(var/entry in matter) // this allows for the projectile in the casing having the correct matter + matter[entry] /= pellets // yet disallows for pellet shrapnel created on impact multiplying the matter count + . = ..() /obj/item/projectile/bullet/pellet/Bumped() . = ..() diff --git a/code/modules/projectiles/projectile/bullettypes.dm b/code/modules/projectiles/projectile/bullettypes.dm index 42d1868a64..e1e7cb66e7 100644 --- a/code/modules/projectiles/projectile/bullettypes.dm +++ b/code/modules/projectiles/projectile/bullettypes.dm @@ -26,6 +26,7 @@ There are important things regarding this file: can_ricochet = TRUE penetrating = 2 recoil = 3 + matter = list(MATERIAL_STEEL = 0.05) /obj/item/projectile/bullet/pistol/hv armor_divisor = 1.3 @@ -42,6 +43,7 @@ There are important things regarding this file: embed = FALSE sharp = FALSE can_ricochet = FALSE + matter = list(MATERIAL_STEEL = 0.01) /obj/item/projectile/bullet/pistol/rubber icon_state = "rubber" @@ -54,6 +56,7 @@ There are important things regarding this file: ) embed = FALSE sharp = FALSE + matter = list(MATERIAL_PLASTIC = 0.05) /obj/item/projectile/bullet/pistol/scrap armor_divisor = 0.8 @@ -73,6 +76,7 @@ There are important things regarding this file: armor_divisor = 1 penetrating = 2 can_ricochet = TRUE + matter = list(MATERIAL_STEEL = 0.1) recoil = 3.6 /obj/item/projectile/bullet/srifle/nomuzzle @@ -89,6 +93,7 @@ There are important things regarding this file: embed = FALSE sharp = FALSE can_ricochet = FALSE + matter = list(MATERIAL_STEEL = 0.02) /obj/item/projectile/bullet/srifle/hv armor_divisor = 1.4 @@ -106,6 +111,9 @@ There are important things regarding this file: embed = FALSE sharp = FALSE + matter = list(MATERIAL_PLASTIC = 0.1) + + /obj/item/projectile/bullet/srifle/scrap armor_divisor = 0.7 recoil = 5 @@ -122,6 +130,8 @@ There are important things regarding this file: armor_divisor = 1 penetrating = 2 can_ricochet = FALSE //to reduce collateral damage and FF, since IH use it in their primary firearm + + matter = list(MATERIAL_STEEL = 0.2) // as the casing costs nothing, the bullet costs twice as much. recoil = 2.8 step_delay = 0.9 @@ -136,6 +146,7 @@ There are important things regarding this file: embed = FALSE sharp = FALSE can_ricochet = FALSE + matter = list(MATERIAL_STEEL = 0.02) /obj/item/projectile/bullet/clrifle/hv armor_divisor = 1.4 @@ -155,6 +166,9 @@ There are important things regarding this file: sharp = FALSE can_ricochet = TRUE + matter = list(MATERIAL_PLASTIC = 0.2) + + /obj/item/projectile/bullet/clrifle/scrap armor_divisor = 0.8 recoil = 4.5 @@ -170,6 +184,8 @@ There are important things regarding this file: ) penetrating = 2 can_ricochet = TRUE + matter = list(MATERIAL_STEEL = 0.15) + recoil = 5 /obj/item/projectile/bullet/lrifle/practice @@ -183,6 +199,7 @@ There are important things regarding this file: embed = FALSE sharp = FALSE can_ricochet = FALSE + matter = list(MATERIAL_STEEL = 0.03) /obj/item/projectile/bullet/lrifle/hv armor_divisor = 1.3 @@ -200,6 +217,8 @@ There are important things regarding this file: embed = FALSE sharp = FALSE + matter = list(MATERIAL_PLASTIC = 0.15) + /obj/item/projectile/bullet/lrifle/scrap armor_divisor = 0.7 recoil = 7 @@ -215,6 +234,9 @@ There are important things regarding this file: armor_divisor = 1 can_ricochet = TRUE penetrating = 2 + + wounding_mult = WOUNDING_WIDE + matter = list(MATERIAL_STEEL = 0.1) recoil = 8 step_delay = 1.1 @@ -229,6 +251,7 @@ There are important things regarding this file: embed = FALSE sharp = FALSE can_ricochet = FALSE + matter = list(MATERIAL_STEEL = 0.02) /obj/item/projectile/bullet/magnum/hv armor_divisor = 1.3 @@ -246,6 +269,8 @@ There are important things regarding this file: embed = FALSE sharp = FALSE + matter = list(MATERIAL_PLASTIC = 0.1) + /obj/item/projectile/bullet/magnum/scrap armor_divisor = 0.8 recoil = 9 @@ -262,6 +287,12 @@ There are important things regarding this file: penetrating = 2 step_delay = 0.8 recoil = 15 // Good luck shooting these from a revolver + matter = list(MATERIAL_PLASTEEL = 1) + +/obj/item/projectile/bullet/antim/emp + damage_types = list(BRUTE = 16) + armor_divisor = 2 + matter = list(MATERIAL_STEEL = 1, MATERIAL_IRON = 1, MATERIAL_URANIUM = 1) /obj/item/projectile/bullet/antim/emp damage_types = list( @@ -274,6 +305,8 @@ There are important things regarding this file: /obj/item/projectile/bullet/antim/emp/on_hit(atom/target, blocked = FALSE) . = ..() empulse(target, 0, 0) + matter [MATERIAL_IRON] = 0 + matter [MATERIAL_URANIUM] = 0 /obj/item/projectile/bullet/antim/uranium damage_types = list( @@ -283,6 +316,7 @@ There are important things regarding this file: ) armor_divisor = 5 irradiate = 200 + matter = list(MATERIAL_PLASTEEL = 1, MATERIAL_URANIUM = 1) /obj/item/projectile/bullet/antim/breach damage_types = list( @@ -296,6 +330,7 @@ There are important things regarding this file: nocap_structures = TRUE var/hasBreached = 2 kill_count = 30 + matter = list(MATERIAL_PLASTEEL = 2) /obj/item/projectile/bullet/antim/breach/proc/get_tiles_passed(var/distance) var/tiles_passed = distance @@ -317,6 +352,7 @@ There are important things regarding this file: /obj/item/projectile/bullet/antim/scrap + matter = list(MATERIAL_STEEL = 1) // cheap bullets don't contain plasteel armor_divisor = 1 recoil = 20 @@ -332,6 +368,7 @@ There are important things regarding this file: armor_divisor = 1 knockback = 1 step_delay = 1 + matter = list(MATERIAL_STEEL = 0.5) recoil = 9 /obj/item/projectile/bullet/shotgun/scrap @@ -384,8 +421,10 @@ There are important things regarding this file: knockback = 0 var/fire_stacks = 4 + matter = list(MATERIAL_STEEL = 0.5, MATERIAL_PLASMA = 0.5) /obj/item/projectile/bullet/shotgun/incendiary/on_hit(atom/target, blocked = FALSE) + matter[MATERIAL_PLASMA] = 0 . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target @@ -408,6 +447,7 @@ There are important things regarding this file: spread_step = 10 pellet_to_knockback_ratio = 2 recoil = 5 + matter = list(MATERIAL_STEEL = 0.6) /obj/item/projectile/bullet/pellet/shotgun/Initialize() . = ..() @@ -450,6 +490,8 @@ There are important things regarding this file: armor_divisor = 1 embed = FALSE can_ricochet = TRUE + + matter = list(MATERIAL_STEEL = 1) /// extreme recoil from firing flash forged bolts recoil = 25 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index df6b508fec..0c4ab4f77d 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -55,6 +55,7 @@ brightness = 9 //similar to a flare light_duration = 200 recoil = 8 // Shot from shotguns + matter = list(MATERIAL_STEEL = 0.5, MATERIAL_SILVER = 0.5) /obj/item/projectile/energy/electrode name = "electrode" diff --git a/code/modules/projectiles/projectile/projectilegrenades.dm b/code/modules/projectiles/projectile/projectilegrenades.dm index bd16ab4eb5..06becb32ab 100644 --- a/code/modules/projectiles/projectile/projectilegrenades.dm +++ b/code/modules/projectiles/projectile/projectilegrenades.dm @@ -25,7 +25,8 @@ grenade_effect(target) /obj/item/projectile/bullet/grenade/proc/grenade_effect(target) - return + qdel(src) // DO NOT ALLOW SRC TO SURVIVE THIS + SHOULD_CALL_PARENT(TRUE) /obj/item/projectile/bullet/grenade/blast name = "blast shell" @@ -34,6 +35,7 @@ /obj/item/projectile/bullet/grenade/blast/grenade_effect(target) explosion(get_turf(target), explosion_power, explosion_falloff) + . = ..() /obj/item/projectile/bullet/grenade/heatwave name = "heatwave shell" @@ -44,7 +46,8 @@ var/fire_stacks = TRUE /obj/item/projectile/bullet/grenade/heatwave/grenade_effect(target) - heatwave(target, heavy_range, weak_range, heat_damage, fire_stacks, penetration) + heatwave(target, heavy_range, weak_range, heat_damage, fire_stacks, penetration) + . = ..() /obj/item/projectile/bullet/grenade/frag name = "frag shell" @@ -87,6 +90,7 @@ /obj/item/projectile/bullet/grenade/emp/grenade_effect(target) empulse(target, heavy_emp_range, light_emp_range) + . = ..() /obj/item/projectile/bullet/grenade/emp/low_yield heavy_emp_range = 4 @@ -101,6 +105,7 @@ /obj/item/projectile/bullet/grenade/handgrenade/grenade_effect(target) var/obj/item/grenade/G = new hand_gren(src) G.prime() + . = ..() /obj/item/projectile/bullet/grenade/handgrenade/teargas // Because why not name = "cs shell" diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index cf60fb832c..18f83ca050 100755 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -24,9 +24,11 @@ sharp = TRUE edge = TRUE recoil = 3 + matter = list(MATERIAL_STEEL = 1, MATERIAL_PLASMA = 1) /obj/item/projectile/bullet/gyro/on_hit(atom/target) explosion(get_turf(target), 100, 50) + matter [MATERIAL_PLASMA] = 0 return TRUE /obj/item/projectile/bullet/rocket @@ -44,6 +46,7 @@ var/explosion_falloff = 75 sharp = FALSE edge = FALSE + matter = list(MATERIAL_STEEL = 3, MATERIAL_PLASTEEL = 3, MATERIAL_PLASMA = 2) // as it is caseless, the 'bullet' holds the entire cost. /obj/item/projectile/bullet/rocket/launch(atom/target, target_zone, x_offset, y_offset, angle_offset, proj_sound, user_recoil) set_light(2.5, 0.5, "#dddd00") @@ -51,6 +54,7 @@ /obj/item/projectile/bullet/rocket/on_hit(atom/target) detonate(target) + matter [MATERIAL_PLASMA] = 0 set_light(0) return TRUE @@ -68,6 +72,7 @@ explosion_power = 200 explosion_falloff = 75 + matter = list(MATERIAL_STEEL = 2, MATERIAL_PLASMA = 2) // as it is caseless, the 'bullet' holds the entire cost. /obj/item/projectile/bullet/rocket/hesh name = "high-explosive squash head rocket" @@ -298,8 +303,9 @@ knockback = FALSE can_ricochet = FALSE sharp = FALSE - embed = FALSE + embed = FALSE // plasma is not directly destroyed as projectile does not survive impact recoil = 4 + matter = list(MATERIAL_PLASTIC = 0.5, MATERIAL_PLASMA = 1) /obj/item/projectile/bullet/flare/on_hit(atom/target, blocked = FALSE) . = ..() diff --git a/code/modules/reagents/bonsai.dm b/code/modules/reagents/bonsai.dm index fc1ede2e47..9905cac0ff 100644 --- a/code/modules/reagents/bonsai.dm +++ b/code/modules/reagents/bonsai.dm @@ -9,10 +9,10 @@ name = "Laurelin bonsai" desc = "A small tree, gifted to the club by a previous patron. It subsists off of numerous alcohols, and produces fruits and vegetables in return." - commonLore = "Known as a anomaly in biology. The club refused to allow Moebius Technology to study it." - - icon = 'icons/obj/plants.dmi' - icon_state = "plant-21" //Placeholder until we can get a proper sprite for them. + icon = 'icons/obj/bonsai.dmi' + icon_state = "bonsai_1" + layer = ABOVE_OBJ_LAYER + volumeClass = ITEM_SIZE_NORMAL volume = 100 //Average bottle volume reagent_flags = OPENCONTAINER @@ -28,6 +28,8 @@ ..() GLOB.all_faction_items[src] = GLOB.department_civilian START_PROCESSING(SSobj, src) + icon_state = "bonsai_[rand(1, 4)]" +//make the bonsai a random color each round /obj/item/reagent_containers/bonsai/Destroy() STOP_PROCESSING(SSobj, src) @@ -57,3 +59,5 @@ "potato", "rice")] S.harvest(get_turf(src),0,0,1) + flick(icon_state+"_animation", src) + playsound(loc, 'sound/effects/ding2.ogg', 50, 1, -1) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 9be22ce1ec..78b2807d9f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -669,6 +669,7 @@ center_of_mass = list("x"=16, "y"=13) preloaded_reagents = list("egg" = 3) price_tag = 5 + description_info = "Can have a flashlight used on it to determine if there is a chick inside." /obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity) if(istype(O,/obj/machinery/microwave)) @@ -700,7 +701,32 @@ to_chat(user, SPAN_NOTICE("You color \the [src] [clr]")) icon_state = "egg-[clr]" else - ..() + var/valid = FALSE + if (istype(W, /obj/item/device/lighting)) + var/obj/item/device/lighting/light = W + if(!light.on) + to_chat(usr, SPAN_WARNING("[W] needs to be turned on to reveal the egg's insides.")) + return + valid = TRUE + + else if (istype(W, /obj/item/flame)) + var/obj/item/flame/fire = W + if(!fire.lit) + to_chat(usr, SPAN_WARNING("[W] needs to be aflame to reveal the egg's insides.")) + return + valid = TRUE + if(valid) + switch(amount_grown) + if(0 to 10) + to_chat(usr, SPAN_NOTICE("[src] appears to be a normal egg.")) + if(10 to 50) + to_chat(usr, SPAN_NOTICE("[src] contains a spidery red mass.")) + if(50 to 90) + to_chat(usr, SPAN_NOTICE("[src] contains a partially-grown chick.")) + if(90 to 100) + to_chat(usr, SPAN_NOTICE("[src] contains a partially-grown chick.\nYou hear a faint tapping emanating from \the [src].")) + else + ..() /obj/item/reagent_containers/food/snacks/egg/blue icon_state = "egg-blue" @@ -2491,7 +2517,7 @@ icon_state = "[initial(icon_state)]_hot" /obj/item/reagent_containers/food/snacks/mre/proc/openmre(mob/user) - icon_state = initial(icon_state) += "_open" + icon_state = "[initial(icon_state)]_open" desc = "A plethora of steaming beans mixed with meat, ready for consumption." open = TRUE reagent_flags |= REFILLABLE @@ -2547,7 +2573,7 @@ /obj/item/reagent_containers/food/snacks/proc/open(mob/user) open = TRUE - icon_state = initial(icon_state) += "_open" + icon_state = "[initial(icon_state)]_open" update_icon() /obj/item/reagent_containers/food/snacks/attack_self(mob/user) diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index 0f89bf6f14..b92a13a9c9 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -346,8 +346,12 @@ scannable = 1 /datum/reagent/medicine/alkysine/affect_blood(mob/living/carbon/M, alien, effect_multiplier) - M.adjustBrainLoss(-(3 + (M.getBrainLoss() * 0.05)) * effect_multiplier) - M.add_chemical_effect(CE_PAINKILLER, 10) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/obj/item/organ/internal/vital/brain/B = H.internal_organs_by_efficiency[BP_BRAIN] + if(!BP_IS_ROBOTIC(B) && prob(75)) + M.add_chemical_effect(CE_PAINKILLER, 10) + M.add_chemical_effect(CE_BRAINHEAL, 1) /datum/reagent/medicine/imidazoline name = "Imidazoline" @@ -367,8 +371,8 @@ var/obj/item/organ/internal/E = H.random_organ_by_process(OP_EYES) if(E && istype(E)) var/list/current_wounds = E.GetComponents(/datum/component/internal_wound) - if(LAZYLEN(current_wounds) && prob(10)) - SEND_SIGNAL_OLD(E, COMSIG_IORGAN_REMOVE_WOUND, pick(current_wounds)) + if(LAZYLEN(current_wounds) && prob(75)) + M.add_chemical_effect(CE_EYEHEAL, 1) /datum/reagent/medicine/imidazoline/overdose(mob/living/carbon/M, alien) . = ..() @@ -395,7 +399,9 @@ for(var/obj/item/organ/I in organs_sans_brain_and_bones) var/list/current_wounds = I.GetComponents(/datum/component/internal_wound) if(LAZYLEN(current_wounds) && !BP_IS_ROBOTIC(I) && prob(75)) //Peridaxon heals only non-robotic organs - SEND_SIGNAL_OLD(I, COMSIG_IORGAN_REMOVE_WOUND, pick(current_wounds)) + M.add_chemical_effect(CE_ONCOCIDAL, 1) + M.add_chemical_effect(CE_BLOODCLOT, 1) + M.add_chemical_effect(CE_ANTITOX, 2) /datum/reagent/medicine/peridaxon/overdose(mob/living/carbon/M, alien) . = ..() diff --git a/code/modules/reagents/reagents/nanites.dm b/code/modules/reagents/reagents/nanites.dm index 01cd621ed7..ccafad0358 100644 --- a/code/modules/reagents/reagents/nanites.dm +++ b/code/modules/reagents/reagents/nanites.dm @@ -163,15 +163,15 @@ description = "Microscopic construction robots programmed to heal body cells." /datum/reagent/nanites/nanosymbiotes/will_occur(mob/living/carbon/M, alien, var/location) - if(..() && (M.getBruteLoss() || M.getFireLoss() || M.getToxLoss() || M.getCloneLoss() || M.getBrainLoss())) + if(..() && (M.getBruteLoss() || M.getFireLoss() || M.getOxyLoss())) return TRUE /datum/reagent/nanites/nanosymbiotes/affect_blood(mob/living/carbon/M, alien, effect_multiplier) if(..()) - M.heal_organ_damage(1 * effect_multiplier, 1 * effect_multiplier, 3 * effect_multiplier, 3 * effect_multiplier) - M.add_chemical_effect(CE_TOXIN, -((1 + (M.chem_effects[CE_TOXIN] * 0.03)) * effect_multiplier)) - M.adjustOxyLoss(-(1 + (M.getOxyLoss() * 0.03)) * effect_multiplier) - M.adjustBrainLoss(-(1 + (M.getBrainLoss() * 0.03)) * effect_multiplier) + M.add_chemical_effect(CE_ONCOCIDAL, 1) + M.adjustOxyLoss(-(1 + (M.getOxyLoss() * 0.03)) * effect_multiplier) + M.adjustFireLoss(-(1 + (M.getFireLoss() * 0.03)) * effect_multiplier) + M.adjustBruteLoss(-(1 + (M.getBruteLoss() * 0.03)) * effect_multiplier) /datum/reagent/nanites/oxyrush name = "Oxyrush" @@ -196,17 +196,17 @@ if(..() && ishuman(M)) var/mob/living/carbon/human/H = M for(var/obj/item/organ/organ in H.organs) //Grab the organ holding the implant. - if(organ.damage > 0 && !BP_IS_ROBOTIC(organ)) + if(organ.status & ORGAN_WOUNDED && !BP_IS_ROBOTIC(organ)) return TRUE /datum/reagent/nanites/trauma_control_system/affect_blood(mob/living/carbon/M, alien, effect_multiplier) - if(..() && ishuman(M)) - var/mob/living/carbon/human/H = M - for(var/obj/item/organ/organ in H.organs) //Grab the organ holding the implant. - if (istype(organ, /obj/item/organ/external) && organ.damage > 0 && !BP_IS_ROBOTIC(organ)) - organ.heal_damage((2 + organ.damage * 0.03)* effect_multiplier, (2 + organ.damage * 0.03)* effect_multiplier) - else if (istype(organ, /obj/item/organ/internal) && organ.damage > 0 && !BP_IS_ROBOTIC(organ)) - organ.heal_damage((2 + organ.damage * 0.03)* effect_multiplier) + if(..()) + M.add_chemical_effect(CE_ONCOCIDAL, 1) + M.add_chemical_effect(CE_BLOODCLOT, 1) + M.add_chemical_effect(CE_ANTITOX, 2) + M.add_chemical_effect(CE_STABLE, 1) + M.add_chemical_effect(CE_BRAINHEAL, 1) + M.add_chemical_effect(CE_EYEHEAL, 1) /datum/reagent/nanites/purgers name = "Purgers" diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index d4244a4881..4b1008be40 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -194,7 +194,7 @@ if(volume >= 5) if(istype(T, /turf/simulated/wall)) var/turf/simulated/wall/W = T - W.thermite = 1 + W.thermite = TRUE W.overlays += image('icons/effects/effects.dmi',icon_state = "#673910") remove_self(5) return TRUE @@ -492,15 +492,20 @@ /datum/reagent/resuscitator/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/obj/item/organ/internal/vital/heart/heart = H.random_organ_by_process(OP_HEART) - if(BP_IS_ROBOTIC(heart)) // neither it should work on robotic hearts, chemistry and stuf - return - if(heart) - heart.damage += 0.5 + var/obj/item/organ/internal/vital/heart = H.random_organ_by_process(OP_HEART) + if(heart) //Check for existence of the heart BEFORE checking for robotic heart, otherwise function WILL return null + if(BP_IS_ROBOTIC(heart)) // neither it should work on robotic hearts, chemistry and stuff + return + heart.take_damage(64, TOX) if(prob(30)) to_chat(H, SPAN_DANGER("Your heart feels like it's going to tear itself out of you!")) - if(H.stat == DEAD) - H.resuscitate() + if(H.stat == DEAD) + H.resuscitate() + remove_self(60) + else + if(H.stat == DEAD) + H.resuscitate() //it will fail and give explanations why + remove_self(60) /datum/reagent/resuscitator/overdose(mob/living/carbon/M, alien) . = ..() diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index 2341cf5527..10b360b7b8 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -128,12 +128,25 @@ reagent_state = LIQUID color = "#CF3600" strength = 2 - metabolism = REM * 2 + metabolism = REM/4 //0.05 Cyanide lasts within one day but duh... /datum/reagent/toxin/cyanide/affect_blood(mob/living/carbon/M, alien, effect_multiplier) ..() - M.adjustOxyLoss(2 * effect_multiplier) - M.AdjustSleeping(1) + if(!ishuman(M)) + return + var/mob/living/carbon/human/H = M + var/obj/item/organ/internal/vital/heart/S = H.random_organ_by_process(OP_HEART) + var/obj/item/organ/internal/vital/lungs/O = H.random_organ_by_process(OP_LUNGS) + if(prob(20)) + M.hallucination(50 * effect_multiplier, 50 * effect_multiplier) + M.AdjustSleeping(20) + if(istype(O)) //STAGE 1: CRUSH LUNGS + create_overdose_wound(O, M, /datum/component/internal_wound/organic/heavy_poisoning, "accumulation") + M.adjustOxyLoss(5) + if(istype(S) && (!istype(O) || (O.status & ORGAN_DEAD))) //STAGE 2: NO LUNGS? FUCK YOUR HEART + create_overdose_wound(S, M, /datum/component/internal_wound/organic/heavy_poisoning, "accumulation") + M.adjustHalLoss(20) + M.vomit() /datum/reagent/toxin/potassium_chloride name = "Potassium Chloride" diff --git a/code/modules/reagents/recipes.dm b/code/modules/reagents/recipes.dm index fd357119f0..487d9eeea7 100644 --- a/code/modules/reagents/recipes.dm +++ b/code/modules/reagents/recipes.dm @@ -1907,7 +1907,7 @@ /datum/chemical_reaction/nanosymbiotes result = "nanosymbiotes" - required_reagents = list("nanites" = 1, "peridaxon" = 1) + required_reagents = list("nanites" = 1, "bicaridine" = 1) result_amount = 1 /datum/chemical_reaction/oxyrush @@ -1917,7 +1917,7 @@ /datum/chemical_reaction/trauma_control_system result = "trauma_control_system" - required_reagents = list("nanites" = 1, "bicaridine" = 1) + required_reagents = list("nanites" = 1, "peridaxon" = 1) result_amount = 1 /datum/chemical_reaction/nanopurgers diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 63ca207116..326415b67d 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -1,6 +1,3 @@ -#define MESSAGE_SERVER_SPAM_REJECT 1 -#define MESSAGE_SERVER_DEFAULT_SPAM_LIMIT 10 - var/global/list/obj/machinery/message_server/message_servers = list() /datum/data_pda_msg @@ -57,21 +54,15 @@ var/global/list/obj/machinery/message_server/message_servers = list() idle_power_usage = 10 active_power_usage = 100 - var/list/datum/data_pda_msg/pda_msgs = list() var/list/datum/data_rc_msg/rc_msgs = list() var/active = 1 var/decryptkey = "password" - //Spam filtering stuff - var/list/spamfilter = list("You have won", "your prize", "male enhancement", "shitcurity", \ - "are happy to inform you", "account number", "enter your PIN") - //Messages having theese tokens will be rejected by server. Case sensitive - var/spamfilter_limit = MESSAGE_SERVER_DEFAULT_SPAM_LIMIT //Maximal amount of tokens /obj/machinery/message_server/New() message_servers += src decryptkey = GenerateKey() - send_pda_message("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.") + send_rc_message("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.") ..() return @@ -97,14 +88,6 @@ var/global/list/obj/machinery/message_server/message_servers = list() update_icon() return -/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "") - var/result - for (var/token in spamfilter) - if (findtextEx(message,token)) - message = "[message]" //Rejected messages will be indicated by red color. - result = token //Token caused rejection (if there are multiple, last will be chosen>. - pda_msgs += new/datum/data_pda_msg(recipient,sender,message) - return result /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) @@ -116,7 +99,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() for (var/obj/machinery/requests_console/Console in allConsoles) if (ckey(Console.department) == ckey(recipient)) if(Console.inoperable()) - Console.message_log += "Message lost due to console failure. Please contact [station_name()] system adminsitrator or AI for technical assistance. " + Console.message_log += "Message lost due to console failure. Please contact [station_name] system adminsitrator or AI for technical assistance. " continue if(Console.newmessagepriority < priority) Console.newmessagepriority = priority @@ -143,15 +126,6 @@ var/global/list/obj/machinery/message_server/message_servers = list() return -/obj/machinery/message_server/attackby(obj/item/O as obj, mob/living/user as mob) - if (active && !(stat & (BROKEN|NOPOWER)) && (spamfilter_limit < MESSAGE_SERVER_DEFAULT_SPAM_LIMIT*2) && \ - istype(O,/obj/item/electronics/circuitboard/message_monitor)) - spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2) - user.drop_item() - qdel(O) - to_chat(user, "You install additional memory and processors into message server. Its filtering capabilities been enhanced.") - else - ..(O, user) /obj/machinery/message_server/update_icon() if((stat & (BROKEN|NOPOWER))) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 4db1877532..0c665bdd5c 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -35,7 +35,7 @@ /obj/machinery/autolathe/rnd/protolathe name = "protolathe" - desc = "A machine used for construction of advanced prototypes. Operated from an R\&D console." + desc = "A machine used for construction of advanced prototypes. Operated from an R&D console." icon_state = "protolathe" circuit = /obj/item/electronics/circuitboard/protolathe @@ -45,7 +45,7 @@ /obj/machinery/autolathe/rnd/imprinter name = "circuit imprinter" - desc = "A machine used for printing advanced circuit boards. Operated from an R\&D console." + desc = "A machine used for printing advanced circuit boards. Operated from an R&D console." icon_state = "imprinter" circuit = /obj/item/electronics/circuitboard/circuit_imprinter diff --git a/code/modules/sanity_grain/sanity_grain.dm b/code/modules/sanity_grain/sanity_grain.dm index d1b8700d62..133714d438 100644 --- a/code/modules/sanity_grain/sanity_grain.dm +++ b/code/modules/sanity_grain/sanity_grain.dm @@ -29,7 +29,14 @@ PERK_HOLY_LIGHT, // Aura ) + // Suppressital clears the mind + if(S.getPerk(PERK_NJOY)) + grain.icon_state = "" + return + var/state = "[rand(1, 9)] " + + //Some perks reduce the amount of grain even at low sanity. This is either because the character is used to bad conditions, or faith clears their mind. for(var/perk in S.perks ? light_grain_perks : list()) if(S.getPerk(perk)) switch(new_level) diff --git a/code/modules/scrap/oldificator.dm b/code/modules/scrap/oldificator.dm index 896fd325d9..0b2d54fd6c 100644 --- a/code/modules/scrap/oldificator.dm +++ b/code/modules/scrap/oldificator.dm @@ -80,6 +80,7 @@ GET_COMPONENT(oldified, /datum/component/oldficator) if(oldified) return FALSE + pre_old(low_quality_oldification) AddComponent(/datum/component/oldficator) light_color = color if(!low_quality_oldification) @@ -177,6 +178,15 @@ reagents.remove_reagent(R.id,rand(0, R.volume),TRUE) reagents.add_reagent("mold", rand(0, actual_volume - reagents.total_volume)) +//makes old cigarettes rank +/obj/item/clothing/mask/smokable/cigarette/make_old(low_quality_oldification) + .=..() + if(. && (!low_quality_oldification)) + var/actual_volume = reagents.total_volume + for(var/datum/reagent/R in reagents.reagent_list) + reagents.remove_reagent(R.id,rand(0, R.volume),TRUE) + reagents.add_reagent("mold", rand(0, actual_volume - reagents.total_volume)) + //Old chemical bottles also hide their reagents /obj/item/reagent_containers/glass/bottle/make_old(low_quality_oldification) .=..() @@ -423,3 +433,28 @@ if(SEND_SIGNAL_OLD(trash_mod, COMSIG_IATTACK, src, null)) break QDEL_NULL(trash_mod) + +/obj/item/ammo_casing/make_old(low_quality_oldification) + if(!low_quality_oldification)// reducing the materials otherwise is infeasible due to BYOND's + if(prob(90)) // incapability of restoring the initial value of a list typed var + return // so 10% of the time we just delete the bullet + if(is_caseless) + if(istype(loc, /obj/item/ammo_magazine)) // delete lingering reference + var/obj/item/ammo_magazine/holder = loc + holder.stored_ammo.Remove(src) + qdel(src) + else + qdel(src) + else + expend() + +/obj/item/projectile/make_old(low_quality_oldification) + return // why would the bullet being old change anything? + +/obj/proc/pre_old() // defined for compatibility + return + +/obj/item/ammo_magazine/pre_old(low_quality_oldification = FALSE) // this is needed to allow casings + if(!low_quality_oldification) // contained to self-delete + for(var/obj/item/ammo_casing/casing in stored_ammo) + casing.make_old() // this doesn't technically oldify anything, so can be done here diff --git a/code/modules/scrap/scrap.dm b/code/modules/scrap/scrap.dm index fe79126877..a27f70ae09 100644 --- a/code/modules/scrap/scrap.dm +++ b/code/modules/scrap/scrap.dm @@ -414,6 +414,7 @@ GLOBAL_LIST_EMPTY(scrap_base_cache) SPAWN_BOOZE, SPAWN_JUNK, SPAWN_CLEANABLE, SPAWN_MATERIAL_JUNK, + SPAWN_CIGARETTE_MAINTS, SPAWN_PART_ARMOR = 0.1 ) diff --git a/code/modules/shuttles/_defines.dm b/code/modules/shuttles/_defines.dm index 6eff66372f..18bb533a18 100644 --- a/code/modules/shuttles/_defines.dm +++ b/code/modules/shuttles/_defines.dm @@ -1,4 +1,3 @@ #define SHUTTLE_FLAGS_NONE 0 #define SHUTTLE_FLAGS_PROCESS 1 -#define SHUTTLE_FLAGS_SUPPLY 2 #define SHUTTLE_FLAGS_ALL (~SHUTTLE_FLAGS_NONE) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 05637fe54e..096d714927 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -48,18 +48,12 @@ SSshuttle.shuttles[src.name] = src if(flags & SHUTTLE_FLAGS_PROCESS) SSshuttle.process_shuttles += src - if(flags & SHUTTLE_FLAGS_SUPPLY) - if(SSsupply.shuttle) - CRASH("A supply shuttle is already defined.") - SSsupply.shuttle = src /datum/shuttle/Destroy() current_location = null SSshuttle.shuttles -= src.name SSshuttle.process_shuttles -= src - if(SSsupply.shuttle == src) - SSsupply.shuttle = null . = ..() diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm deleted file mode 100644 index 7b4e72d21e..0000000000 --- a/code/modules/shuttles/shuttle_supply.dm +++ /dev/null @@ -1,77 +0,0 @@ -/datum/shuttle/autodock/ferry/supply - var/away_location = 1 //the location to hide at while pretending to be in-transit - var/late_chance = 80 - var/max_late_time = (30 SECONDS) - flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY - category = /datum/shuttle/autodock/ferry/supply - -/datum/shuttle/autodock/ferry/supply/short_jump(area/destination) - if(moving_status != SHUTTLE_IDLE) - return - - if(isnull(location)) - return - - //it would be cool to play a sound here - moving_status = SHUTTLE_WARMUP - spawn(warmup_time*10) - if (moving_status == SHUTTLE_IDLE) - return //someone cancelled the launch - - if (at_station() && forbidden_atoms_check()) - //cancel the launch because of forbidden atoms. announce over supply channel? - moving_status = SHUTTLE_IDLE - return - - if (!at_station()) //at centcom - SSsupply.buy() - - //We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period. - var/obj/effect/shuttle_landmark/away_waypoint = get_location_waypoint(away_location) - moving_status = SHUTTLE_INTRANSIT - - //If we are at the away_landmark then we are just pretending to move, otherwise actually do the move - if (next_location == away_waypoint) - attempt_move(away_waypoint) - - //wait ETA here. - arrive_time = world.time + SSsupply.movetime - while (world.time <= arrive_time) - sleep(5) - - if (next_location != away_waypoint) - //late - if (prob(late_chance)) - sleep(rand(0,max_late_time)) - - attempt_move(destination) - - moving_status = SHUTTLE_IDLE - - if (!at_station()) //at centcom - SSsupply.sell() - -// returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms -/datum/shuttle/autodock/ferry/supply/proc/forbidden_atoms_check() - if (!at_station()) - return 0 //if badmins want to send forbidden atoms on the supply shuttle from centcom we don't care - - for(var/area/A in shuttle_area) - if(SSsupply.forbidden_atoms_check(A)) - return 1 - -/datum/shuttle/autodock/ferry/supply/proc/at_station() - return (!location) - -//returns 1 if the shuttle is idle and we can still mess with the cargo shopping list -/datum/shuttle/autodock/ferry/supply/proc/idle() - return (moving_status == SHUTTLE_IDLE) - -//returns the ETA in minutes -/datum/shuttle/autodock/ferry/supply/proc/eta_minutes() - var/ticksleft = arrive_time - world.time - return max(0, round(ticksleft/600,1)) - -/datum/shuttle/autodock/ferry/supply/proc/eta_seconds() - var/ticksleft = arrive_time - world.time - return max(0, round(ticksleft/10,1)) diff --git a/code/modules/surgery/internal.dm b/code/modules/surgery/internal.dm index 3a59ae8701..ffe19f6eee 100644 --- a/code/modules/surgery/internal.dm +++ b/code/modules/surgery/internal.dm @@ -52,13 +52,13 @@ SPAN_WARNING("[user]'s gripper slips, hitting [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your gripper slips, hitting [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(5, BRUTE, 0) else user.visible_message( SPAN_WARNING("[user]'s hand slips, hitting [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, hitting [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(5, BRUTE, 0) /datum/surgery_step/insert_item/robotic required_stat = STAT_MEC diff --git a/code/modules/surgery/mods.dm b/code/modules/surgery/mods.dm index 8fbaa81abc..c4f7a4eda7 100644 --- a/code/modules/surgery/mods.dm +++ b/code/modules/surgery/mods.dm @@ -37,7 +37,7 @@ SPAN_WARNING("[user]'s hand slips, damaging [organ.get_surgery_name()] with \the [mod]!"), SPAN_WARNING("Your hand slips, damaging [organ.get_surgery_name()] with \the [mod]!") ) - organ.take_damage(5, 0) + organ.take_damage(rand(24, 32), BRUTE, edge = TRUE) /datum/surgery_step/remove_mod required_tool_quality = QUALITY_LASER_CUTTING @@ -61,7 +61,7 @@ SPAN_WARNING("[user]'s hand slips, damaging [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, damaging [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(rand(24, 32), BRUTE, sharp = TRUE) /datum/surgery_step/examine required_tool_quality = null diff --git a/code/modules/surgery/organic.dm b/code/modules/surgery/organic.dm index d029d7f1c4..53d4645e88 100644 --- a/code/modules/surgery/organic.dm +++ b/code/modules/surgery/organic.dm @@ -29,7 +29,7 @@ organ.open = 1 organ.setBleeding() - organ.take_damage(1, 0, sharp=TRUE, edge=TRUE) + organ.take_damage(1, BRUTE, sharp=TRUE, edge=TRUE) if(required_tool_quality == QUALITY_LASER_CUTTING) organ.clamp_wounds() @@ -41,7 +41,7 @@ SPAN_WARNING("[user]'s hand slips, slicing open [organ.get_surgery_name()] in the wrong place with \the [tool]!"), SPAN_WARNING("Your hand slips, slicing open [organ.get_surgery_name()] in the wrong place with \the [tool]!") ) - organ.take_damage(10, 0, sharp=TRUE, edge=TRUE) + organ.take_damage(10, BRUTE, sharp=TRUE, edge=TRUE) /datum/surgery_step/cut_open/laser @@ -112,7 +112,7 @@ SPAN_WARNING("[user]'s hand slips, leaving a small burn on [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, leaving a small burn on [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(0, 3) + organ.take_damage(5, BURN) @@ -142,6 +142,7 @@ ) organ.status &= ~ORGAN_CUT_AWAY + organ.handle_organ_eff() //organ is attached. Refreshing eff. list organ.insert(organ.get_limb()) /datum/surgery_step/attach_organ/fail_step(mob/living/user, obj/item/organ/internal/organ, obj/item/stack/tool) @@ -149,7 +150,7 @@ SPAN_WARNING("[user]'s hand slips, damaging [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, damaging [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(16, BRUTE) @@ -178,13 +179,14 @@ SPAN_NOTICE("You separate [organ.get_surgery_name()] with \the [tool].") ) organ.status |= ORGAN_CUT_AWAY + organ.handle_organ_eff() //detach of organ. Refreshing eff. list /datum/surgery_step/detach_organ/fail_step(mob/living/user, obj/item/organ/internal/organ, obj/item/stack/tool) user.visible_message( SPAN_WARNING("[user]'s hand slips, damaging [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, damaging [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(16, BRUTE) /datum/surgery_step/break_bone target_organ_type = /obj/item/organ/internal/bone @@ -216,7 +218,7 @@ SPAN_WARNING("[user]'s hand slips, scraping [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, scraping [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(8, BRUTE, sharp = TRUE) /datum/surgery_step/mend_bone target_organ_type = /obj/item/organ/internal @@ -255,7 +257,7 @@ SPAN_WARNING("[user]'s hand slips, scraping [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, scraping [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(5, 0) + organ.take_damage(8, BRUTE) /datum/surgery_step/replace_bone target_organ_type = /obj/item/organ/internal @@ -310,6 +312,10 @@ organ.owner_custom_pain("The pain in your [organ.name] is living hell!", 1) /datum/surgery_step/remove_item/end_step(mob/living/user, obj/item/organ/external/organ, obj/item/tool, atom/movable/target) + if(istype(target, /mob/living/simple_animal/borer)) + var/mob/living/simple_animal/borer/B = target + B.detach() + B.leave_host() user.visible_message( SPAN_NOTICE("[user] extracts something out of [organ.get_surgery_name()] with \the [tool]."), SPAN_NOTICE("You extract [target] out of [organ.get_surgery_name()] with \the [tool].") @@ -355,7 +361,7 @@ SPAN_WARNING("[user]'s hand slips, sawing through the bone in [organ.get_surgery_name()] with \the [tool]!"), SPAN_WARNING("Your hand slips, sawing through the bone in [organ.get_surgery_name()] with \the [tool]!") ) - organ.take_damage(30, 0, sharp=TRUE, edge=TRUE) + organ.take_damage(128, BRUTE, sharp=TRUE, edge=TRUE) organ.fracture() diff --git a/code/modules/surgery/organic_damage.dm b/code/modules/surgery/organic_damage.dm index 061e75e6b8..6e798e98e5 100644 --- a/code/modules/surgery/organic_damage.dm +++ b/code/modules/surgery/organic_damage.dm @@ -167,7 +167,7 @@ to_chat(user, SPAN_WARNING("You need an advanced trauma kit to complete this step.")) /datum/surgery_step/fix_brute/proc/get_tool_name(obj/item/stack/tool) - var/tool_name = "\the regenerative membrane" + var/tool_name = "the regenerative membrane" return tool_name /datum/surgery_step/fix_brute/can_use(mob/living/user, obj/item/organ/external/organ, obj/item/tool) @@ -213,7 +213,7 @@ to_chat(user, SPAN_WARNING("You need an advanced burn kit to complete this step.")) /datum/surgery_step/fix_burn/proc/get_tool_name(obj/item/stack/tool) - var/tool_name = "\the regenerative membrane" + var/tool_name = "the regenerative membrane" return tool_name /datum/surgery_step/fix_burn/can_use(mob/living/user, obj/item/organ/external/organ, obj/item/tool) @@ -239,7 +239,7 @@ SPAN_NOTICE("You finish treating damage to [organ.get_surgery_name()] with \the [tool].") ) organ.heal_damage(0, 25, TRUE) - else + else to_chat(user, SPAN_NOTICE("\The [tool] is used up.")) /datum/surgery_step/fix_burn/fail_step(mob/living/user, obj/item/organ/external/organ, obj/item/tool) diff --git a/code/modules/surgery/robotic.dm b/code/modules/surgery/robotic.dm index 88c2d50ac6..75d55353d2 100644 --- a/code/modules/surgery/robotic.dm +++ b/code/modules/surgery/robotic.dm @@ -67,8 +67,10 @@ ) if(organ.status & ORGAN_CUT_AWAY) organ.status &= ~ORGAN_CUT_AWAY + organ.handle_organ_eff() else organ.status |= ORGAN_CUT_AWAY + organ.handle_organ_eff() /datum/surgery_step/robotic/connect_organ/fail_step(mob/living/user, obj/item/organ/internal/organ, obj/item/stack/tool) user.visible_message( @@ -94,6 +96,10 @@ ) /datum/surgery_step/robotic/remove_item/end_step(mob/living/user, obj/item/organ/external/organ, obj/item/tool, atom/movable/target) + if(istype(target, /mob/living/simple_animal/borer)) // the fact that you wrench out a borer like a bolt is fucking stupid and funny + var/mob/living/simple_animal/borer/B = target + B.detach() + B.leave_host() user.visible_message( SPAN_NOTICE("[user] extracts something out of [organ.get_surgery_name()] with \the [tool]."), SPAN_NOTICE("You extract [target] out of [organ.get_surgery_name()] with \the [tool].") diff --git a/code/modules/tips_and_tricks/roles.dm b/code/modules/tips_and_tricks/roles.dm index 380674ce0f..b3370616f2 100644 --- a/code/modules/tips_and_tricks/roles.dm +++ b/code/modules/tips_and_tricks/roles.dm @@ -42,3 +42,8 @@ /tipsAndTricks/roles/carrionsurgery roles_list = list(/datum/antagonist/carrion) tipText = "As a carrion, you have greatly increased control over your body - if you want to perform self-surgery, you can do it standing up." + +/tipsAndTricks/roles/borerLang + roles_list = list(/datum/antagonist/borer) + tipText = "As a borer, reading a host's mind will teach you the languages they know. For every language you learn you get more experience." + diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm index e5ef2395e9..fbc77f7501 100644 --- a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm +++ b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm @@ -72,8 +72,8 @@ "Armor" = list( /obj/item/clothing/suit/armor/heavy/riot, /obj/item/clothing/head/armor/faceshield/riot, - /obj/item/clothing/suit/armor/vest/security, - /obj/item/clothing/suit/armor/vest/full/security, + /obj/item/clothing/suit/armor/vest/toggle, + /obj/item/clothing/suit/armor/vest/toggle/full, /obj/item/clothing/head/armor/helmet, /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof/full, diff --git a/code/modules/unit_tests/map_tests.dm b/code/modules/unit_tests/map_tests.dm index 5cf3829b4e..891880ebab 100644 --- a/code/modules/unit_tests/map_tests.dm +++ b/code/modules/unit_tests/map_tests.dm @@ -6,8 +6,7 @@ /datum/unit_test/area_contents/Run() var/static/list/exempt_areas = typesof( /area/space, /area/skipjack_station, - /area/shuttle, /area/holodeck, - /area/supply/station, /area/outpost/pulsar) + /area/shuttle, /area/holodeck, /area/outpost/pulsar) var/static/list/exempt_from_atmos = typesof( /area/eris/maintenance, /area/eris/storage, diff --git a/code/modules/unit_tests/zas_tests.dm b/code/modules/unit_tests/zas_tests.dm index 11bc7a750f..2de0b8ef2b 100644 --- a/code/modules/unit_tests/zas_tests.dm +++ b/code/modules/unit_tests/zas_tests.dm @@ -15,7 +15,6 @@ /datum/unit_test/zas_area_test/Run() var/list/normal_test = list( - /area/supply/dock, /area/shuttle/escape/centcom, /area/turret_protected/ai, /area/shuttle/mining/station, diff --git a/dependencies.sh b/dependencies.sh index f9b448e0f8..df23abad0e 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -4,8 +4,8 @@ #Final authority on what's required to fully build the project # byond version -export BYOND_MAJOR=514 -export BYOND_MINOR=1568 +export BYOND_MAJOR=515 +export BYOND_MINOR=1634 #rust_g git tag export RUST_G_VERSION=1.0.1 @@ -15,7 +15,7 @@ export NODE_VERSION=14 export NODE_VERSION_PRECISE=14.16.1 # SpacemanDMM git tag -export SPACEMAN_DMM_VERSION=suite-1.7.1 +export SPACEMAN_DMM_VERSION=suite-1.8 # Extools git tag export EXTOOLS_VERSION=v0.0.7 diff --git a/icons/effects/wall_graffiti.dmi b/icons/effects/wall_graffiti.dmi index ef9353e1cd..d6ec3a2a5e 100644 Binary files a/icons/effects/wall_graffiti.dmi and b/icons/effects/wall_graffiti.dmi differ diff --git a/icons/inventory/accessory/icon.dmi b/icons/inventory/accessory/icon.dmi index e1b41243f0..4595c36d14 100644 Binary files a/icons/inventory/accessory/icon.dmi and b/icons/inventory/accessory/icon.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index d9ab0ca838..1d8c2324b5 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/face/icon.dmi b/icons/inventory/face/icon.dmi index ad1923b295..07d3c51338 100644 Binary files a/icons/inventory/face/icon.dmi and b/icons/inventory/face/icon.dmi differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index 34c38c5ea6..ebf73c114f 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/icons/inventory/feet/icon.dmi b/icons/inventory/feet/icon.dmi index 362a5c9ed9..a6c7f66f3b 100644 Binary files a/icons/inventory/feet/icon.dmi and b/icons/inventory/feet/icon.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index fd52246b15..efa7f14787 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/head/icon.dmi b/icons/inventory/head/icon.dmi index 86da3ead90..a97d44a4cd 100644 Binary files a/icons/inventory/head/icon.dmi and b/icons/inventory/head/icon.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 5f9c8546e7..b2697fba8f 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/icon.dmi b/icons/inventory/suit/icon.dmi index 11d463fbf0..0a49cf8303 100644 Binary files a/icons/inventory/suit/icon.dmi and b/icons/inventory/suit/icon.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 05a7ddb712..262b94c913 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_fem.dmi b/icons/inventory/suit/mob_fem.dmi index 33a6c16bdd..1812c3971a 100644 Binary files a/icons/inventory/suit/mob_fem.dmi and b/icons/inventory/suit/mob_fem.dmi differ diff --git a/icons/obj/bonsai.dmi b/icons/obj/bonsai.dmi new file mode 100644 index 0000000000..2c86c32b1c Binary files /dev/null and b/icons/obj/bonsai.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index bf69a8086d..91448131a3 100755 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi index c4e6ee917e..d2ea065a33 100644 Binary files a/icons/obj/candle.dmi and b/icons/obj/candle.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index a96bc4af87..43a3de2f46 100755 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/curtain.dmi b/icons/obj/curtain.dmi index 69b7de1dc0..d8db66d3df 100644 Binary files a/icons/obj/curtain.dmi and b/icons/obj/curtain.dmi differ diff --git a/icons/obj/cyberplants.dmi b/icons/obj/cyberplants.dmi index 4490859fbf..a5f02f54d0 100644 Binary files a/icons/obj/cyberplants.dmi and b/icons/obj/cyberplants.dmi differ diff --git a/icons/obj/guns/projectile/carabine.dmi b/icons/obj/guns/projectile/carabine.dmi index 269b9dda18..fbfd7a9524 100644 Binary files a/icons/obj/guns/projectile/carabine.dmi and b/icons/obj/guns/projectile/carabine.dmi differ diff --git a/icons/obj/hud_full.dmi b/icons/obj/hud_full.dmi index 9ae0bd0634..322172ea35 100644 Binary files a/icons/obj/hud_full.dmi and b/icons/obj/hud_full.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index ae0ef484fd..ac771156e0 100755 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 7034052dd8..a1406831db 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 86eaa4edd9..a45f29ce25 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/machines/autolathe.dmi b/icons/obj/machines/autolathe.dmi index 6d9bbffebe..3e611ee98b 100644 Binary files a/icons/obj/machines/autolathe.dmi and b/icons/obj/machines/autolathe.dmi differ diff --git a/icons/obj/machines/mining_turret.dmi b/icons/obj/machines/mining_turret.dmi index 37e572336f..6c5345765a 100644 Binary files a/icons/obj/machines/mining_turret.dmi and b/icons/obj/machines/mining_turret.dmi differ diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index 4d025a51e7..36228514af 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ diff --git a/icons/obj/modular_pda.dmi b/icons/obj/modular_pda.dmi index b7ee4f1d74..1ec1cee08f 100644 Binary files a/icons/obj/modular_pda.dmi and b/icons/obj/modular_pda.dmi differ diff --git a/icons/obj/pieces.dmi b/icons/obj/pieces.dmi index de3a197b8c..c15fe5e5c1 100644 Binary files a/icons/obj/pieces.dmi and b/icons/obj/pieces.dmi differ diff --git a/icons/obj/plants.dmi b/icons/obj/plants.dmi index d3f8e0eff7..fe08417818 100644 Binary files a/icons/obj/plants.dmi and b/icons/obj/plants.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index dfb046620d..d6e68ae7a8 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index b3a08220c2..8a61a3bb9d 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 14ca1988f9..0082a4b63d 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -13203,6 +13203,9 @@ /obj/spawner/pack/tech_loot/low_chance, /obj/spawner/gun_parts/low_chance, /obj/spawner/gun_parts/low_chance, +/obj/effect/decal/cleanable/graffiti{ + pixel_y = 33 + }, /turf/simulated/floor/tiled/steel, /area/eris/maintenance/section2deck4central) "aGH" = ( @@ -29461,6 +29464,9 @@ /obj/structure/table/rack/shelf, /obj/spawner/pouch, /obj/spawner/pouch, +/obj/effect/decal/cleanable/graffiti/graffiti_onestar{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint_panels, /area/eris/maintenance/section3deck1central) "bsl" = ( @@ -33666,6 +33672,9 @@ /area/eris/security/lobby) "bCC" = ( /obj/spawner/pack/machine, +/obj/effect/decal/cleanable/graffiti/graffiti_techno{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/maintenance/section4deck4port) "bCD" = ( @@ -70877,6 +70886,10 @@ dir = 4; pixel_y = 8 }, +/obj/effect/decal/cleanable/graffiti{ + pixel_x = -30; + pixel_y = 5 + }, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section1deck1central) "dpk" = ( @@ -73990,6 +74003,9 @@ /obj/effect/decal/cleanable/dirt, /obj/spawner/firstaid/low_chance, /obj/spawner/firstaid/low_chance, +/obj/effect/decal/cleanable/graffiti/graffiti_excelsior{ + pixel_y = 33 + }, /turf/simulated/floor/tiled/dark/panels, /area/eris/maintenance/oldbridge) "dwO" = ( @@ -74635,9 +74651,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/status_display/supply_display{ - pixel_x = -32 - }, /turf/simulated/floor/carpet/bcarpet, /area/eris/command/meeting_room) "dyF" = ( @@ -83537,6 +83550,10 @@ /obj/spawner/pack/machine, /obj/spawner/pack/tech_loot/low_chance, /obj/spawner/pack/tech_loot/low_chance, +/obj/effect/decal/cleanable/graffiti/graffiti_techno{ + pixel_x = -25; + pixel_y = 5 + }, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section4deck1central) "dVp" = ( @@ -87158,6 +87175,9 @@ dir = 1 }, /obj/landmark/storyevent/hidden_vent_antag, +/obj/effect/decal/cleanable/graffiti{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/dark/panels, /area/eris/maintenance/oldbridge) "eeq" = ( @@ -92595,6 +92615,7 @@ /obj/item/device/synthesized_instrument/guitar/multi, /obj/item/device/synthesized_instrument/guitar, /obj/item/device/synthesized_instrument/synthesizer, +/obj/item/toy/plushie/fumo/bocchi, /turf/simulated/floor/wood, /area/eris/crew_quarters/clownoffice) "erF" = ( @@ -99649,6 +99670,12 @@ "fFd" = ( /turf/simulated/floor/tiled/steel/monofloor, /area/eris/quartermaster/hangarsupply) +"fGN" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_moebius{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white/brown_platform, +/area/eris/maintenance/section3deck1central) "fHj" = ( /obj/effect/shuttle_landmark/pirate/deck3_cargo, /turf/space, @@ -99907,6 +99934,20 @@ }, /turf/simulated/floor/tiled/steel/bar_dance, /area/holodeck/alphadeck) +"gkk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/graffiti/graffiti_skull{ + pixel_y = 35 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section3deck2port) "gkN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -100381,6 +100422,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section3deck1central) +"hlo" = ( +/obj/structure/bed/chair, +/obj/landmark/join/start/assistant, +/obj/effect/decal/cleanable/graffiti/graffiti_doodle{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/steel/brown_perforated, +/area/eris/maintenance/section3deck3starboard) "hlV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -100520,6 +100569,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/eris/neotheology/office) +"hzF" = ( +/obj/effect/decal/cleanable/graffiti{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck1central) "hAw" = ( /obj/spawner/scrap/sparse/low_chance, /turf/simulated/floor/plating/under, @@ -101184,6 +101239,12 @@ }, /turf/simulated/floor/tiled/steel, /area/eris/quartermaster/storage) +"iVj" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_heart{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck1central) "iVN" = ( /obj/structure/closet/coffin, /obj/machinery/light/small{ @@ -101230,6 +101291,20 @@ /obj/effect/shuttle_landmark/merc/engine, /turf/space, /area/space) +"iXN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/graffiti/graffiti_doodle{ + pixel_y = 35 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section1deck4central) "iXO" = ( /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/grass, @@ -101783,6 +101858,13 @@ }, /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/section3starboard) +"kdj" = ( +/obj/structure/reagent_dispensers/fueltank/huge, +/obj/effect/decal/cleanable/graffiti/graffiti_clown{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/techmaint_panels, +/area/eris/maintenance/fueltankstorage) "keu" = ( /turf/simulated/floor/tiled/white/golden, /area/eris/neotheology/altar) @@ -102369,6 +102451,7 @@ dir = 8 }, /obj/item/reagent_containers/food/drinks/mug/gold, +/obj/item/stamp/nt, /turf/simulated/floor/carpet/bcarpet, /area/eris/neotheology/office) "lCK" = ( @@ -102694,6 +102777,12 @@ }, /turf/simulated/floor/tiled/steel/techfloor, /area/eris/engineering/foyer) +"mro" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_ancapno{ + pixel_y = 35 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section3deck2starboard) "mrW" = ( /obj/structure/catwalk, /turf/simulated/floor/plating/under, @@ -102718,6 +102807,12 @@ }, /turf/simulated/floor/tiled/steel, /area/eris/crew_quarters/kitchen) +"mwt" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_skull{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck2starboard) "mxw" = ( /obj/structure/cable/green{ d1 = 2; @@ -103090,27 +103185,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section4deck3port) "nnj" = ( -/obj/structure/closet/wardrobe/color/pink, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/bikehorn, -/obj/item/reagent_containers/spray/waterflower, -/obj/item/reagent_containers/spray/waterflower, -/obj/item/storage/fancy/crayons, -/obj/item/storage/fancy/crayons, -/obj/item/device/pda/clown, -/obj/item/device/pda/clown, -/obj/item/clothing/mask/gas/plaguedoctor, -/obj/item/clothing/mask/gas/plaguedoctor, -/obj/item/clothing/glasses/monocle, -/obj/item/clothing/glasses/monocle, +/obj/structure/closet/wardrobe/color/pink/artist, /turf/simulated/floor/wood, /area/eris/crew_quarters/clownoffice) "npf" = ( @@ -103240,6 +103315,13 @@ }, /turf/simulated/floor/tiled/white, /area/eris/medical/medbreak) +"nJC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/decal/cleanable/graffiti/graffiti_onestar{ + pixel_y = -25 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section1deck1central) "nJR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -103437,6 +103519,13 @@ }, /turf/simulated/floor/tiled/white/golden, /area/eris/neotheology/bioprinter) +"ouh" = ( +/obj/structure/bed/padded, +/obj/effect/decal/cleanable/graffiti/graffiti_skull{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/steel/brown_perforated, +/area/eris/maintenance/section3deck3starboard) "oup" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -103837,6 +103926,12 @@ "pbI" = ( /turf/simulated/floor/wood, /area/eris/medical/psych) +"pcf" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_ironhammer{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section1deck5central) "pcs" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white, @@ -103924,6 +104019,12 @@ }, /turf/simulated/floor/tiled/steel/bar_dance, /area/holodeck/alphadeck) +"pti" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_excelsior{ + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section4deck1central) "ptn" = ( /obj/structure/cable/green{ d1 = 4; @@ -104555,6 +104656,14 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/eris/neotheology/chapelritualroom) +"qNr" = ( +/obj/spawner/junk/low_chance, +/obj/effect/decal/cleanable/graffiti/graffiti_clown{ + pixel_x = -30; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck3port) "qOs" = ( /obj/structure/lattice, /obj/effect/window_lwall_spawn/smartspawn, @@ -104740,6 +104849,16 @@ /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/crew_quarters/fitness) +"rpd" = ( +/obj/machinery/conveyor/north{ + id = "minetocargo" + }, +/obj/effect/decal/cleanable/graffiti/graffiti_ancapyes{ + pixel_x = 25; + pixel_y = 5 + }, +/turf/simulated/floor/plating/under, +/area/eris/quartermaster/storage) "rqg" = ( /obj/structure/closet/secure_closet/personal, /obj/item/device/radio/intercom{ @@ -104953,6 +105072,12 @@ }, /turf/simulated/floor/plating, /area/eris/crew_quarters/kitchen) +"rTm" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_kot{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section1deck2central) "rTs" = ( /turf/simulated/wall/r_wall, /area/eris/crew_quarters/clubmanager) @@ -104967,6 +105092,13 @@ }, /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/funeral) +"rVy" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_moebius{ + pixel_x = 30; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section2deck1port) "rVB" = ( /obj/machinery/shower, /obj/structure/curtain/open/shower, @@ -105215,6 +105347,18 @@ /obj/spawner/tool_upgrade/low_chance, /turf/simulated/floor/tiled/steel/techfloor_grid, /area/eris/engineering/breakroom) +"svW" = ( +/obj/structure/table/rack, +/obj/item/device/lighting/glowstick/flare, +/obj/item/device/lighting/glowstick/flare, +/obj/spawner/pack/tech_loot, +/obj/spawner/pack/tech_loot, +/obj/spawner/lowkeyrandom/low_chance, +/obj/effect/decal/cleanable/graffiti{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/techmaint_panels, +/area/eris/hallway/main/section2) "sxh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -105440,6 +105584,12 @@ }, /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/funeral) +"sRL" = ( +/obj/effect/decal/cleanable/graffiti{ + pixel_y = 35 + }, +/turf/simulated/floor/hull, +/area/space) "sUy" = ( /obj/structure/table/rack, /obj/item/stack/cable_coil, @@ -105608,8 +105758,8 @@ /obj/structure/table/woodentable, /obj/item/gun/projectile/shotgun/doublebarrel, /obj/item/reagent_containers/bonsai{ - pixel_x = 8; - pixel_y = 16 + pixel_x = 0; + pixel_y = 0 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -105673,6 +105823,13 @@ /obj/spawner/lowkeyrandom/low_chance, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck1port) +"ttu" = ( +/obj/spawner/material/ore/low_chance, +/obj/effect/decal/cleanable/graffiti/graffiti_aster{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck4starboard) "tuO" = ( /obj/structure/cable/green{ d1 = 4; @@ -105837,6 +105994,26 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/eris/quartermaster/hangarsupply) +"tQD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/graffiti/graffiti_neotheo{ + pixel_y = 35 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section3deck5starboard) "tQV" = ( /obj/spawner/junk/low_chance, /turf/simulated/floor/plating/under, @@ -106357,6 +106534,13 @@ "uYj" = ( /turf/simulated/wall/r_wall, /area/eris/neotheology/bioprinter) +"uYl" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_carrion{ + pixel_x = 25; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck1central) "uZh" = ( /obj/structure/lattice, /turf/simulated/open, @@ -106617,6 +106801,12 @@ }, /turf/simulated/floor/tiled/steel, /area/eris/quartermaster/hangarsupply) +"vyY" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_carrion{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section3deck2starboard) "vAE" = ( /turf/simulated/wall/r_wall, /area/eris/crew_quarters/clownoffice) @@ -106807,6 +106997,12 @@ /obj/structure/railing, /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck5port) +"vTK" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_heart{ + pixel_y = 35 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/oldtele) "vXK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -107350,6 +107546,12 @@ "xld" = ( /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/engineering/engine_room) +"xnE" = ( +/obj/effect/decal/cleanable/graffiti/graffiti_moebius{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techmaint, +/area/eris/maintenance/section2deck2starboard) "xoj" = ( /obj/machinery/computer/jtb_console, /turf/simulated/floor/tiled/dark/gray_perforated, @@ -107388,6 +107590,23 @@ }, /turf/simulated/floor/wood, /area/eris/medical/psych) +"xue" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/graffiti/graffiti_ironhammer{ + pixel_y = 35 + }, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section1deck4central) "xuA" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -107412,12 +107631,6 @@ }, /turf/simulated/floor/tiled/white/brown_platform, /area/eris/medical/medbay/organs) -"xwS" = ( -/obj/machinery/status_display/supply_display{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/steel, -/area/eris/quartermaster/hangarsupply) "xxi" = ( /obj/machinery/door/firedoor, /obj/effect/window_lwall_spawn/smartspawn, @@ -107460,6 +107673,13 @@ /obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/carpet/sblucarpet, /area/eris/crew_quarters/clubmanager) +"xAv" = ( +/obj/spawner/scrap, +/obj/effect/decal/cleanable/graffiti/graffiti_ancapyes{ + pixel_y = 33 + }, +/turf/simulated/floor/tiled/steel/techfloor_grid, +/area/eris/maintenance/section3deck4starboard) "xAA" = ( /obj/structure/bed/psych, /turf/simulated/floor/carpet, @@ -121449,7 +121669,7 @@ aaa aaa acR aqW -arE +kdj asC asX asV @@ -128348,7 +128568,7 @@ pVr apn bRh arI -bRN +tQD apn aad aad @@ -130964,7 +131184,7 @@ ato ato ato ato -xwS +ato ato fFd atx @@ -131315,7 +131535,7 @@ afs afP agE dAp -dzn +pcf dzi dzi dzi @@ -165657,7 +165877,7 @@ beE beE beE afs -aVp +iXN aWc csS aXl @@ -166469,7 +166689,7 @@ aVE aWf aWz csS -aYS +xue baa cvH csS @@ -172995,7 +173215,7 @@ clH clH clH clH -clH +rpd clH cgO aaa @@ -174819,7 +175039,7 @@ bVX dtF dtF dtG -dtF +xAv dtF bVX aaa @@ -176824,7 +177044,7 @@ cqR cqR cqR bVX -dgh +ttu dgh dgh dgh @@ -201264,7 +201484,7 @@ cxu dRP dSH cAf -ccz +qNr esO duu abF @@ -216410,7 +216630,7 @@ dvd dFG dFG dvd -ewa +hlo dSb ewg dUi @@ -217228,7 +217448,7 @@ dSi dGQ dOr dvd -dYC +ouh dUc dRt dZk @@ -241288,7 +241508,7 @@ uiz dKH dKH dNB -abF +sRL abF abF abF @@ -241453,7 +241673,7 @@ abF dqI dqI dqI -dZV +gkk edk dqI aaa @@ -248947,7 +249167,7 @@ xOd xOd xOd chY -dqP +mwt dqP dlI dqI @@ -249527,7 +249747,7 @@ dsG dti dth bZc -cSw +svW cPA dmo dmo @@ -249913,7 +250133,7 @@ aaa abF abF bdN -beg +xnE cHT beg cPf @@ -250106,7 +250326,7 @@ diJ diJ dek dek -bKI +rTm bPg bPe aaa @@ -251079,7 +251299,7 @@ aaa aaa aaa csc -ctZ +vTK csc aaa aaa @@ -252787,7 +253007,7 @@ azz eqS drm ayQ -dqP +vyY erd ere ere @@ -253185,7 +253405,7 @@ efB edX eus ebN -ayD +mro ayQ eBZ eqT @@ -281898,7 +282118,7 @@ aaa ekU elK elP -eho +pti ehk ehk ehk @@ -284692,7 +284912,7 @@ aLZ boS eqI boS -cNH +hzF btZ aCh boS @@ -285252,7 +285472,7 @@ dFh dFh dFh dFh -dFh +nJC dHe dIG doD @@ -288703,7 +288923,7 @@ amc amc aof amc -amc +rVy amQ efd efY @@ -288726,7 +288946,7 @@ aRx aYk bdz boS -cNH +iVj ezN ezY eAe @@ -296417,7 +296637,7 @@ aQV bvO cNH boS -boF +fGN boF boS boS @@ -297214,7 +297434,7 @@ blt dXi bov cNH -cNH +uYl cNH cNH cNH diff --git a/maps/CEVEris/centcomm.dmm b/maps/CEVEris/centcomm.dmm index 74b4fcd7a4..161b7dbfee 100644 --- a/maps/CEVEris/centcomm.dmm +++ b/maps/CEVEris/centcomm.dmm @@ -87,26 +87,9 @@ }, /turf/simulated/floor/tiled/dark/gray_platform, /area/centcom/evac) -"aF" = ( -/turf/unsimulated/wall, -/area/centcom/suppy) "aI" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source/industrial) -"aO" = ( -/turf/unsimulated/floor{ - icon_state = "plating"; - name = "plating" - }, -/area/centcom/suppy) -"aP" = ( -/turf/unsimulated/wall{ - desc = "That looks like it doesn't open easily."; - icon = 'icons/obj/doors/rapid_pdoor.dmi'; - icon_state = "pdoor1"; - name = "Shuttle Bay Blast Door" - }, -/area/centcom/suppy) "aR" = ( /obj/structure/table/bar_special, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -162,277 +145,21 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/holofloor/reinforced, /area/space) -"bd" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall8" - }, -/turf/space, -/area/supply/dock) -"be" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall7" - }, -/area/supply/dock) -"bf" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall6" - }, -/area/supply/dock) -"bg" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall5" - }, -/area/supply/dock) -"bh" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall4" - }, -/area/supply/dock) -"bi" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall3" - }, -/area/supply/dock) -"bj" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall2" - }, -/area/supply/dock) -"bk" = ( -/turf/simulated/shuttle/wall/cargo, -/area/supply/dock) "bt" = ( /obj/structure/railing/holorailing/grey, /turf/simulated/open/holonofloor, /area/holodeck/source/wireframe) -"bv" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall9" - }, -/turf/space, -/area/supply/dock) -"bw" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall10" - }, -/area/supply/dock) -"bx" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"by" = ( -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"bz" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "supply_shuttle"; - pixel_x = 0; - pixel_y = 25; - req_one_access = list(13,31); - tag_door = "supply_shuttle_hatch" - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"bA" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall11" - }, -/area/supply/dock) "bI" = ( /obj/structure/cryofeed, /turf/simulated/floor/tiled/dark/gray_platform, /area/centcom/evac) -"bJ" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall12" - }, -/turf/space, -/area/supply/dock) -"bK" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall13" - }, -/area/supply/dock) -"bL" = ( -/obj/machinery/conveyor/east{ - id = "QMLoad" - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"bM" = ( -/obj/machinery/door/airlock/maintenance{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "supply_shuttle_hatch"; - locked = 1; - name = "Shuttle Hatch"; - req_access = list(13) - }, -/obj/machinery/conveyor/east{ - id = "QMLoad" - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"bT" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall14" - }, -/turf/space, -/area/supply/dock) -"bU" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall15" - }, -/area/supply/dock) -"bV" = ( -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor3"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"bW" = ( -/obj/machinery/door/airlock/maintenance{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "supply_shuttle_hatch"; - locked = 1; - name = "Shuttle Hatch"; - req_access = list(13) - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cd" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall16" - }, -/turf/space, -/area/supply/dock) -"ce" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall17" - }, -/area/supply/dock) -"cf" = ( -/obj/effect/shuttle_landmark/supply/centcom, -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall18" - }, -/area/supply/dock) "cg" = ( /turf/simulated/floor/tiled/dark/gray_perforated, /area/holodeck/source/industrial_arena) -"ck" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall19" - }, -/turf/space, -/area/supply/dock) -"cl" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall20" - }, -/area/supply/dock) "cq" = ( /obj/machinery/cryopod, /turf/simulated/floor/tiled/dark/gray_platform, /area/centcom/evac) -"cs" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall21" - }, -/turf/space, -/area/supply/dock) -"ct" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall22" - }, -/area/supply/dock) -"cu" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cv" = ( -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor5"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cw" = ( -/obj/machinery/conveyor/west{ - id = "QMLoad2" - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cx" = ( -/obj/machinery/door/airlock/maintenance{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "supply_shuttle_hatch"; - locked = 1; - name = "Shuttle Hatch"; - req_access = list(13) - }, -/obj/machinery/conveyor/west{ - id = "QMLoad2" - }, -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor1"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cA" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall23" - }, -/turf/space, -/area/supply/dock) -"cB" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall24" - }, -/area/supply/dock) -"cC" = ( -/turf/simulated/shuttle/floor{ - icon_state = "cargofloor6"; - name = "Cargo Transport Shuttle (A5)" - }, -/area/supply/dock) -"cD" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall25" - }, -/area/supply/dock) "cE" = ( /obj/structure/railing/holorailing, /turf/simulated/floor/holofloor/tiled/dark, @@ -466,47 +193,6 @@ "cN" = ( /turf/simulated/floor/tiled/dark/golden, /area/centcom/evac) -"cW" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall26" - }, -/turf/space, -/area/supply/dock) -"cX" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall27" - }, -/area/supply/dock) -"cY" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall28" - }, -/area/supply/dock) -"cZ" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall29" - }, -/area/supply/dock) -"da" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall30" - }, -/area/supply/dock) -"db" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall31" - }, -/area/supply/dock) -"dc" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall32" - }, -/area/supply/dock) -"dd" = ( -/turf/simulated/shuttle/wall/cargo{ - icon_state = "cargoshwall33" - }, -/area/supply/dock) "dj" = ( /obj/machinery/light{ dir = 1 @@ -538,54 +224,6 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/tiled/dark/gray_platform, /area/centcom/evac) -"dq" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall34" - }, -/turf/space, -/area/supply/dock) -"dr" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall35" - }, -/turf/space, -/area/supply/dock) -"ds" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall36" - }, -/turf/space, -/area/supply/dock) -"dt" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall37" - }, -/turf/space, -/area/supply/dock) -"du" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall38" - }, -/turf/space, -/area/supply/dock) -"dv" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall39" - }, -/turf/space, -/area/supply/dock) -"dw" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall40" - }, -/turf/space, -/area/supply/dock) -"dx" = ( -/obj/structure/shuttle_part/cargo{ - icon_state = "cargoshwall41" - }, -/turf/space, -/area/supply/dock) "dz" = ( /obj/structure/lattice, /turf/simulated/open/holonofloor, @@ -2719,7 +2357,7 @@ /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "smindicate"; + id = "serbianmerc"; name = "Outer Airlock"; opacity = 0 }, @@ -2760,7 +2398,7 @@ /obj/structure/table/standard, /obj/machinery/computer/pod/old/syndicate{ dir = 4; - id = "smindicate" + id = "serbianmerc" }, /obj/machinery/door/window{ dir = 4; @@ -6585,7 +6223,7 @@ /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "smindicate"; + id = "serbianmerc"; name = "Outer Airlock"; opacity = 0 }, @@ -6839,7 +6477,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor=5,/obj/item/device/assembly/signaler=4,/obj/item/device/assembly/infra=4,/obj/item/device/assembly/prox_sensor=4,/obj/item/handcuffs=8,/obj/item/device/flash=4,/obj/item/cartridge/signal=4,/obj/item/clothing/glasses/sunglasses=4) + products = list(/obj/item/device/assembly/prox_sensor=5,/obj/item/device/assembly/signaler=4,/obj/item/device/assembly/infra=4,/obj/item/device/assembly/prox_sensor=4,/obj/item/handcuffs=8,/obj/item/device/flash=4,/obj/item/clothing/glasses/sunglasses=4) }, /obj/machinery/light{ dir = 4 @@ -25324,21 +24962,21 @@ aa aa aa aa -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -25526,21 +25164,21 @@ aa aa aa aa -aF -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -25728,21 +25366,21 @@ aa aa aa aa -aF -aO -bd -bv -bJ -bT -cd -ck -cs -cA -cW -dq -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -25930,21 +25568,21 @@ aa aa aa aa -aF -aO -be -bw -bK -bU -ce -cl -ct -cB -cX -dr -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -26132,21 +25770,21 @@ aa aa aa aa -aF -aO -bf -bx -by -by -by -by -cu -by -cY -ds -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -26334,21 +25972,21 @@ aa aa aa aa -aF -aO -bg -by -by -by -by -by -by -by -cZ -dt -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -26536,21 +26174,21 @@ aa aa aa aa -aF -aO -bh -bz -by -by -by -by -cv -cC -da -du -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -26738,21 +26376,21 @@ aa aa aa aa -aF -aO -bi -by -by -by -by -by -by -by -db -dv -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -26940,21 +26578,21 @@ aa aa aa aa -aF -aO -bj -by -bL -bV -by -bV -cw -by -dc -dw -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -27142,21 +26780,21 @@ aa aa aa aa -aF -aO -bk -bA -bM -bW -cf -bW -cx -cD -dd -dx -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -27344,21 +26982,21 @@ aa aa aa aa -aF -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aO -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -27546,21 +27184,21 @@ aa aa aa aa -aF -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aF +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa diff --git a/maps/CEVEris/shuttles-eris.dm b/maps/CEVEris/shuttles-eris.dm index 181ad70a3e..4cb8904f2c 100644 --- a/maps/CEVEris/shuttles-eris.dm +++ b/maps/CEVEris/shuttles-eris.dm @@ -302,17 +302,6 @@ icon_state = "shuttle-red" landmark_tag = "nav_merc_sec3east5" -//Cargo shuttle - -/datum/shuttle/autodock/ferry/supply/drone - name = "Supply Shuttle" - location = 1 - warmup_time = 10 - shuttle_area = /area/supply/dock - waypoint_offsite = "nav_cargo_start" - waypoint_station = "nav_cargo_vessel" - default_docking_controller = "supply_shuttle" - /obj/effect/shuttle_landmark/supply/centcom name = "Centcom" landmark_tag = "nav_cargo_start" diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index a0e7c28ff5..1210cbaabf 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -122,7 +122,6 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{:helper.link('Security Records', 'gear', {'choice' : "45"}, null, 'fixedLeftWide')}}
- {{if data.cartridge.radio ==1}} {{:helper.link('Security Bot Access', 'gear', {'choice' : "46"}, null, 'fixedLeftWide')}} {{/if}}
@@ -135,7 +134,6 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{:helper.link('Supply Records', 'gear', {'choice' : "47"}, null, 'fixedLeftWide')}}
- {{if data.cartridge.radio == 3}} {{:helper.link('Delivery Bot Control', 'gear', {'choice' : "48"}, null, 'fixedLeftWide')}} {{/if}}
@@ -155,8 +153,6 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{if data.cartridge.access.access_janitor==1}}
{{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}}
{{/if}}
- {{if data.cartridge.radio == 2}}
- {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}}
{{/if}}
{{if data.cartridge.access.access_reagent_scanner==1}}
{{:helper.link(data.scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}}
@@ -208,99 +204,6 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
- {{else data.mode == 2}}
- SpaceMessenger V4.0.1-
-
- {{if data.toff == 0}}
-
- Messenger Functions:
-
-
- {{:helper.link(data.message_silent==1 ? 'Ringer: Off' : 'Ringer: On', data.message_silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}}
- {{:helper.link(data.toff==1 ? 'Messenger: Off' : 'Messenger: On',data.toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}}
- {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}}
- {{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}}
-
- - {{if data.cartridge}} - {{if data.cartridge.charges}} -
- {{:data.cartridge.charges}}
- {{if data.cartridge.access.access_detonate_pda}} detonation charges left. {{/if}}
- {{if data.cartridge.access.access_clown || data.cartridge.access.access_mime}} viral files left. {{/if}}
-
-
- {{/if}}
- {{/if}}
-
- {{if data.pda_count == 0}}
- No other PDAS located
- {{else}}
- - Current Conversations- {{for data.convopdas}} -
- {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : value.Reference } , null, value.fixedLeftWider)}}
- {{if data.cartridge}}
- {{if data.cartridge.access.access_detonate_pda && value.Detonate}}
- {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}}
- {{/if}}
- {{if data.cartridge.access.access_clown}}
- {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}}
- {{/if}}
- {{if data.cartridge.access.access_mime}}
- {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}}
- {{/if}}
- {{/if}}
-
- {{/for}}
- Other PDAs- {{for data.pdas}} -
- {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, value.fixedLeftWider)}}
- {{if data.cartridge}}
- {{if data.cartridge.access.access_detonate_pda && value.Detonate}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}}
- {{if data.cartridge.access.access_clown}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}}
- {{if data.cartridge.access.access_mime}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}}
- {{/if}}
-
- {{/for}}
- {{/if}}
- {{/if}}
-
-
- {{else data.mode == 21}}
- SpaceMessenger V4.0.1-
-
-
- Messenger Functions:
-
-
- {{:helper.link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'fixedLeftWide')}}
-
- - - Conversation with: {{:data.convo_name}} ({{:data.convo_job}})-
-
- {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'fixedLeft')}}
-
-
{{else data.mode== 41}}
-
-
- {{for data.messages}}
- {{if data.active_conversation == value.target}}
- {{if value.sent==0}}
- Them: {{:value.message}}
- - {{else}} - You: {{:value.message}} - {{/if}} - {{/if}} - {{/for}} - |