From bd39011ab4b834ba803420e8149ada07d27e2d35 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 16 Jun 2017 09:39:43 -0400 Subject: [PATCH] NSFW Gun Also fixes slidey walls at centcom, gives the ERT commander a NSFW with stun, xray, lethal, and net. Gives deathsquad a full NSFW kit (including 'final option' ammo), replaces my own fluff Hunter with a NSFW with stun and net (so, same as the hunter, but that sprite is so badass I can't help it), and fixes a typo on my permit while I'm on there (KIN isn't a thing, KHI is). --- code/game/machinery/recharger.dm | 15 +- .../vore/fluffstuff/custom_boxes_vr.dm | 14 +- .../vore/fluffstuff/custom_permits_vr.dm | 2 +- code/modules/vore/fluffstuff/guns/nsfw.dm | 383 ++++++++++++++++++ .../modules/vore/fluffstuff/guns/protector.dm | 7 +- code/modules/vore/fluffstuff/guns/pummeler.dm | 4 + code/modules/vore/fluffstuff/guns/sickshot.dm | 4 + icons/obj/ammo_vr.dmi | Bin 1920 -> 4599 bytes icons/vore/custom_guns_vr.dmi | Bin 29331 -> 28763 bytes maps/tether/tether-06-colony.dmm | 35 +- maps/tether/tether-08-ships.dmm | 3 +- vorestation.dme | 1 + 12 files changed, 436 insertions(+), 32 deletions(-) create mode 100644 code/modules/vore/fluffstuff/guns/nsfw.dm diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 39d23d03fd..44a112cab5 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -8,7 +8,7 @@ obj/machinery/recharger idle_power_usage = 4 active_power_usage = 40000 //40 kW var/obj/item/charging = null - var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric) + var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_casing/nsfw_batt) //VOREStation Add - NSFW Batteries var/icon_state_charged = "recharger2" var/icon_state_charging = "recharger1" var/icon_state_idle = "recharger0" //also when unpowered @@ -187,6 +187,19 @@ obj/machinery/recharger update_use_power(1) return + //VOREStation Add - NSFW Batteries + if(istype(charging, /obj/item/ammo_casing/nsfw_batt)) + var/obj/item/ammo_casing/nsfw_batt/batt = charging + if(batt.shots_left >= initial(batt.shots_left)) + icon_state = icon_state_charged + update_use_power(1) + else + icon_state = icon_state_charging + batt.shots_left++ + update_use_power(2) + return + //VOREStation Add End + /obj/machinery/recharger/emp_act(severity) if(stat & (NOPOWER|BROKEN) || !anchored) ..(severity) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 3923b8ba98..2a0275a01b 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -163,19 +163,15 @@ New() ..() //Might look like a lot... but all small items. - /* - new /obj/item/weapon/reagent_containers/hypospray/vr/fluff/aronai(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_st(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bt(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bu(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_tx(src) - */ //Centcom stuff and permit new /obj/item/weapon/card/id/centcom/fluff/aronai(src) new /obj/item/fluff/permit/aronai_kadigan(src) - //new /obj/item/clothing/glasses/omnihud/med/fluff/aronai(src) //Gun and holster - new /obj/item/weapon/gun/energy/netgun(src) + new /obj/item/weapon/gun/projectile/nsfw(src) + new /obj/item/ammo_magazine/nsfw_mag(src) + new /obj/item/ammo_casing/nsfw_batt/stun(src) + new /obj/item/ammo_casing/nsfw_batt/stun(src) + new /obj/item/ammo_casing/nsfw_batt/net(src) new /obj/item/clothing/accessory/holster(src) //Aerowing:Sebastian Aji diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm index 0576eced52..97625e85ca 100644 --- a/code/modules/vore/fluffstuff/custom_permits_vr.dm +++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm @@ -77,7 +77,7 @@ DOB: 12/Jul/2530 | HEIGHT: 188cm | SEX: Male The individual named above is licensed by the Nanotrasen Department of Civil Protection - to carry one KIN (foreign) personal defense weapon, non-lethal only. + to carry one KHI (foreign) personal defense weapon, non-lethal only. This license expires on 16/Feb/2562 and must be renewed by CentCom prior to this date."} // joanrisu:Joan Risu diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm new file mode 100644 index 0000000000..7ef25c4e22 --- /dev/null +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -0,0 +1,383 @@ +// -------------- NSFW ------------- +/obj/item/weapon/gun/projectile/nsfw + name = "KHI-102b \'NSFW\'" + desc = "Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven \ + energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of \ + energy beams can be configured at once. Ammo not included." + + description_info = "This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type." + description_fluff = "The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." + description_antag = "" + + icon = 'icons/vore/custom_guns_vr.dmi' + icon_state = "nsfw" + + icon_override = 'icons/vore/custom_guns_vr.dmi' + item_state = "gun" + + caliber = "nsfw" + + origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNETS = 4) + + fire_sound = 'sound/weapons/Taser.ogg' + + load_method = MAGAZINE //Nyeh heh hehhh. + magazine_type = null + allowed_magazines = list(/obj/item/ammo_magazine/nsfw_mag) + handle_casings = HOLD_CASINGS //Don't eject batteries! + recoil = 0 + var/charge_left = 0 + var/max_charge = 0 + charge_sections = 5 + +/obj/item/weapon/gun/projectile/nsfw/consume_next_projectile() + if(chambered && ammo_magazine) + var/obj/item/ammo_casing/nsfw_batt/batt = chambered + if(batt.shots_left) + return new chambered.projectile_type() + else + for(var/B in ammo_magazine.stored_ammo) + var/obj/item/ammo_casing/nsfw_batt/other_batt = B + if(istype(other_batt,chambered.type) && other_batt.shots_left) + switch_to(other_batt) + return new chambered.projectile_type() + break + + return null + +/obj/item/weapon/gun/projectile/nsfw/proc/update_charge() + charge_left = 0 + max_charge = 0 + + if(!chambered) + return + + var/obj/item/ammo_casing/nsfw_batt/batt = chambered + + charge_left = batt.shots_left + max_charge = initial(batt.shots_left) + if(ammo_magazine) //Crawl to find more + for(var/B in ammo_magazine.stored_ammo) + var/obj/item/ammo_casing/nsfw_batt/bullet = B + if(istype(bullet,batt.type)) + charge_left += bullet.shots_left + max_charge += initial(bullet.shots_left) + +/obj/item/weapon/gun/projectile/nsfw/proc/switch_to(obj/item/ammo_casing/nsfw_batt/new_batt) + if(ishuman(loc)) + if(chambered && new_batt.type == chambered.type) + to_chat(loc,"\The [src] is now using the next [new_batt.type_name] power cell.") + else + to_chat(loc,"\The [src] is now firing [new_batt.type_name].") + + chambered = new_batt + update_charge() + update_icon() + +/obj/item/weapon/gun/projectile/nsfw/attack_self(mob/user) + if(!chambered) + return + + var/list/stored_ammo = ammo_magazine.stored_ammo + + if(stored_ammo.len == 1) + return //silly you. + + //Find an ammotype that ISN'T the same, or exhaust the list and don't change. + var/our_slot = stored_ammo.Find(chambered) + var/index = our_slot + 1 + var/obj/item/ammo_casing/nsfw_batt/new_choice + + while((index != our_slot) && !new_choice) + if(index > stored_ammo.len) + index = 1 + var/obj/item/ammo_casing/nsfw_batt/next_batt = stored_ammo[index] + if(!istype(next_batt,chambered.type)) + new_choice = next_batt + index++ + + if(new_choice) + switch_to(new_choice) +/* +/obj/item/weapon/gun/projectile/nsfw/special_check(mob/user) + if(!chambered) + return + + var/obj/item/ammo_casing/nsfw_batt/batt = chambered + if(!batt.shots_left) + return FALSE + + return TRUE +*/ +/obj/item/weapon/gun/projectile/nsfw/load_ammo(var/obj/item/A, mob/user) + . = ..() + if(ammo_magazine && ammo_magazine.stored_ammo.len) + switch_to(ammo_magazine.stored_ammo[1]) + +/obj/item/weapon/gun/projectile/nsfw/unload_ammo(mob/user, var/allow_dump=1) + chambered = null + return ..() + +/obj/item/weapon/gun/projectile/nsfw/update_icon() + var/mutable_appearance/ma = new(src) + update_charge() + + if(!chambered) + ma.overlays = list() + appearance = ma + return + + var/obj/item/ammo_casing/nsfw_batt/batt = chambered + var/batt_color = batt.type_color //Used many times + var/list/newverlays = list() + + //Mode bar + var/mutable_appearance/mode_bar = mutable_appearance(icon, "[initial(icon_state)]_type") + mode_bar.color = batt_color + newverlays += mode_bar + + //Barrel color + var/mutable_appearance/barrel_color = mutable_appearance(icon, "[initial(icon_state)]_barrel") + barrel_color.alpha = 150 + barrel_color.color = batt_color + newverlays += barrel_color + + //Charge bar + var/ratio = Ceiling((charge_left / max_charge) * charge_sections) + for(var/i = 0, i < ratio, i++) + var/mutable_appearance/charge_bar = mutable_appearance(icon, "[initial(icon_state)]_charge") + charge_bar.pixel_x = i + charge_bar.color = batt_color + newverlays += charge_bar + + ma.overlays = newverlays + if(ma.overlays.len != newverlays.len) //PANIC! + del(ma) + spawn(5) + update_icon() + return + + appearance = ma + +// The Magazine // +/obj/item/ammo_magazine/nsfw_mag + name = "microbattery magazine" + desc = "A microbattery holder for the \'NSFW\'" + + description_info = "This magazine holds NSFW microbatteries to power the NSFW handgun. Up to three can be loaded at once, and each provides four shots of their respective energy type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." + + icon = 'icons/obj/ammo_vr.dmi' + icon_state = "nsfw_mag" + caliber = "nsfw" + matter = list(DEFAULT_WALL_MATERIAL = 1680, "glass" = 2000) + ammo_type = /obj/item/ammo_casing/nsfw_batt + initial_ammo = 0 + max_ammo = 3 + mag_type = MAGAZINE + + var/list/modes + +/obj/item/ammo_magazine/nsfw_mag/New() + ..() + modes = list() + +/obj/item/ammo_magazine/nsfw_mag/update_icon() + var/mutable_appearance/ma = new(src) + + if(!stored_ammo.len) + ma.overlays = list() + appearance = ma + return //Why bother + + var/x_offset = 5 + var/list/newverlays = list() + + var/current = 0 + for(var/B in stored_ammo) + var/obj/item/ammo_casing/nsfw_batt/batt = B + var/mutable_appearance/cap = mutable_appearance(icon,"[initial(icon_state)]_cap") + cap.color = batt.type_color + cap.pixel_x = current * x_offset //Caps don't need a pixel_y offset + newverlays += cap + + if(batt.shots_left) + var/ratio = Ceiling((batt.shots_left / initial(batt.shots_left)) * 4) //4 is how many lights we have a sprite for + var/mutable_appearance/charge = mutable_appearance(icon,"[initial(icon_state)]_charge-[ratio]") + charge.color = "#29EAF4" //Could use battery color but eh. + charge.pixel_x = current * x_offset + newverlays += charge + + current++ //Increment for offsets + + ma.overlays = newverlays + if(ma.overlays.len != newverlays.len) //PANIC! + del(ma) + spawn(5) + update_icon() + return + + appearance = ma + +// The Casing // +/obj/item/ammo_casing/nsfw_batt + name = "\'NSFW\' microbattery - LETHAL" + desc = "A miniature battery for an energy weapon." + icon = 'icons/obj/ammo_vr.dmi' + icon_state = "nsfw_batt" + flags = CONDUCT + slot_flags = SLOT_BELT | SLOT_EARS + throwforce = 1 + w_class = ITEMSIZE_TINY + + leaves_residue = 0 + caliber = "nsfw" + var/shots_left = 4 + var/type_color = "#bf3d3d" + var/type_name = "LETHAL" + projectile_type = /obj/item/projectile/beam + +/obj/item/ammo_casing/nsfw_batt/New() + pixel_x = rand(-10, 10) + pixel_y = rand(-10, 10) + update_icon() + +/obj/item/ammo_casing/nsfw_batt/update_icon() + var/mutable_appearance/ma = new(src) + ma.overlays.Cut() + + var/mutable_appearance/ends = mutable_appearance(icon,"[initial(icon_state)]_ends") + ends.color = type_color + ma.overlays += ends + + appearance = ma + +/obj/item/ammo_casing/nsfw_batt/expend() + shots_left-- + +// Specific batteries // +/obj/item/ammo_casing/nsfw_batt/stun + name = "\'NSFW\' microbattery - STUN" + type_color = "#0f81bc" + type_name = "STUN" + projectile_type = /obj/item/projectile/beam/stun/blue + +/obj/item/ammo_casing/nsfw_batt/net + name = "\'NSFW\' microbattery - NET" + type_color = "#43f136" + type_name = "NET" + projectile_type = /obj/item/projectile/beam/energy_net + +/obj/item/ammo_casing/nsfw_batt/xray + name = "\'NSFW\' microbattery - XRAY" + type_color = "#32c025" + type_name = "XRAY" + projectile_type = /obj/item/projectile/beam/xray + +/obj/item/ammo_casing/nsfw_batt/shotstun + name = "\'NSFW\' microbattery - SCATTERSTUN" + type_color = "#88ffff" + type_name = "SCATTERSTUN" + projectile_type = /obj/item/projectile/bullet/pellet/e_shot_stun + +/obj/item/projectile/bullet/pellet/e_shot_stun + icon_state = "spell" + damage = 2 + agony = 20 + pellets = 6 //number of pellets + range_step = 2 //projectile will lose a fragment each time it travels this distance. Can be a non-integer. + base_spread = 90 //lower means the pellets spread more across body parts. If zero then this is considered a shrapnel explosion instead of a shrapnel cone + spread_step = 10 + embed_chance = 0 + sharp = 0 + check_armour = "melee" + +/obj/item/ammo_casing/nsfw_batt/ion + name = "\'NSFW\' microbattery - ION" + type_color = "#d084d6" + type_name = "ION" + projectile_type = /obj/item/projectile/ion/small + +/obj/item/ammo_casing/nsfw_batt/stripper + name = "\'NSFW\' microbattery - STRIPPER" + type_color = "#fc8d0f" + type_name = "STRIPPER" + projectile_type = /obj/item/projectile/bullet/stripper + +/obj/item/projectile/bullet/stripper + icon_state = "magicm" + nodamage = 1 + agony = 5 + embed_chance = 0 + sharp = 0 + check_armour = "melee" + +/obj/item/projectile/bullet/stripper/on_hit(var/atom/stripped) + if(ishuman(stripped)) + var/mob/living/carbon/human/H = stripped + if(H.wear_suit) + H.unEquip(H.wear_suit) + if(H.w_uniform) + H.unEquip(H.w_uniform) + if(H.back) + H.unEquip(H.back) + if(H.shoes) + H.unEquip(H.shoes) + if(H.gloves) + H.unEquip(H.gloves) + //Hats can stay! Most other things fall off with removing these. + ..() + +/obj/item/ammo_casing/nsfw_batt/final + name = "\'NSFW\' microbattery - FINAL OPTION" + type_color = "#fcfc0f" + type_name = "FINAL OPTION" //Doesn't look good in yellow in chat + projectile_type = /obj/item/projectile/beam/final_option + +/obj/item/projectile/beam/final_option + name = "final option beam" + icon_state = "omnilaser" + nodamage = 1 + agony = 5 + damage_type = HALLOSS + light_color = "#00CC33" + + muzzle_type = /obj/effect/projectile/laser_omni/muzzle + tracer_type = /obj/effect/projectile/laser_omni/tracer + impact_type = /obj/effect/projectile/laser_omni/impact + +/obj/item/projectile/beam/final_option/on_hit(var/atom/impacted) + if(isliving(impacted)) + var/mob/living/L = impacted + if(L.mind) + var/nif + if(ishuman(L)) + var/mob/living/carbon/human/H = L + nif = H.nif + SStranscore.m_backup(L.mind,nif,one_time = TRUE) + L.gib() + + ..() + +/obj/item/ammo_casing/nsfw_batt/shrink + name = "\'NSFW\' microbattery - SHRINK" + type_color = "#910ffc" + type_name = "SHRINK" + projectile_type = /obj/item/projectile/beam/shrinklaser + +/obj/item/ammo_casing/nsfw_batt/grow + name = "\'NSFW\' microbattery - GROW" + type_color = "#fc0fdc" + type_name = "GROW" + projectile_type = /obj/item/projectile/beam/growlaser + +/obj/item/weapon/storage/secure/briefcase/nsfw_pack + name = "\improper KHI-102b \'NSFW\' gun kit" + desc = "A storage case for a multi-purpose handgun. Variety hour!" + max_w_class = ITEMSIZE_NORMAL + +/obj/item/weapon/storage/secure/briefcase/nsfw_pack/New() + ..() + new /obj/item/weapon/gun/projectile/nsfw(src) + new /obj/item/ammo_magazine/nsfw_mag(src) + for(var/path in typesof(/obj/item/ammo_casing/nsfw_batt)) + new path(src) diff --git a/code/modules/vore/fluffstuff/guns/protector.dm b/code/modules/vore/fluffstuff/guns/protector.dm index 16bc56ee59..173c00b637 100644 --- a/code/modules/vore/fluffstuff/guns/protector.dm +++ b/code/modules/vore/fluffstuff/guns/protector.dm @@ -2,8 +2,11 @@ /obj/item/weapon/gun/energy/protector name = "\improper KHI-98a \'Protector\'" desc = "The KHI-98a is the first firearm custom-designed for Nanotrasen by KHI. It features a powerful stun mode, and \ - an alert-level-locked lethal mode, only usable on code blue and higher. It also features an integrated flashlight! \ - (CtrlClick to toggle flashlight)" + an alert-level-locked lethal mode, only usable on code blue and higher. It also features an integrated flashlight!" + + description_info = "This gun can only be fired in lethal mode while on higher security alert levels. It is legal for sec to carry for this reason, since it cannot be used for lethal force until SOP allows it, in essence." + description_fluff = "The first 'commission' from a Kitsuhana citizen for NanoTrasen, this gun has a wireless connection to the computer's datacore to ensure it can't be used without authorization from heads of staff who have raised the alert level. Until then, *click*!" + description_antag = "The gun can be emagged to remove the lethal security level restriction, allowing it to be fired on lethal mode at all times." icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "prot" diff --git a/code/modules/vore/fluffstuff/guns/pummeler.dm b/code/modules/vore/fluffstuff/guns/pummeler.dm index 21a9013c16..b12ce223e8 100644 --- a/code/modules/vore/fluffstuff/guns/pummeler.dm +++ b/code/modules/vore/fluffstuff/guns/pummeler.dm @@ -5,6 +5,10 @@ sonic blast in the direction of fire, throwing the target away from you at high speed. Now you can REALLY \ turn up the bass to max." + description_info = "This gun punts people away and has a chance of knocking them down briefly. It may also throw them over railings in the process!" + description_fluff = "" + description_antag = "" + icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "pum" diff --git a/code/modules/vore/fluffstuff/guns/sickshot.dm b/code/modules/vore/fluffstuff/guns/sickshot.dm index 87d289e8e7..8733e4aadf 100644 --- a/code/modules/vore/fluffstuff/guns/sickshot.dm +++ b/code/modules/vore/fluffstuff/guns/sickshot.dm @@ -5,6 +5,10 @@ Using a short-range concentrated blast of disruptive sound, the Sickshot will nauseate and confuse the target for several seconds. NOTE: Not suitable \ for use in vacuum, or on animals. May cause contraction and release of various 'things' from various 'orifices'." + description_info = "This gun causes nausea in targets, stunning them briefly and causing vomiting. It will also cause them to vomit up prey, sometimes. Repeated shots may help in that case." + description_fluff = "" + description_antag = "" + icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "sickshot" diff --git a/icons/obj/ammo_vr.dmi b/icons/obj/ammo_vr.dmi index 066d95333eb31daf960201c7da144debf17be589..fe871d3e66b8a38f30f2f54088585f25c652c4c1 100644 GIT binary patch literal 4599 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 delta 1918 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

Uw6j;ls*@Zc|c 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 delta 9156 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 M{#dO{#Uk*301rVFs{jB1 diff --git a/maps/tether/tether-06-colony.dmm b/maps/tether/tether-06-colony.dmm index 9ef0c13a94..b274e497ef 100644 --- a/maps/tether/tether-06-colony.dmm +++ b/maps/tether/tether-06-colony.dmm @@ -533,7 +533,7 @@ "km" = (/obj/structure/closet/l3closet/virology,/obj/item/clothing/mask/gas,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/unsimulated/floor/steel{icon_state = "white"},/area/centcom/medical) "kn" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/turf/unsimulated/floor/steel{icon_state = "white"},/area/centcom/medical) "ko" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"kp" = (/turf/unsimulated/wall{icon = 'icons/turf/transit_vr.dmi'},/area/centcom/specops) +"kp" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/storage/secure/briefcase/nsfw_pack,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "kq" = (/obj/structure/filingcabinet/chestdrawer{desc = "A large drawer filled with autopsy reports."; name = "Autopsy Reports"},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/medical) "kr" = (/obj/structure/table/steel,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/cautery,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/medical) "ks" = (/obj/machinery/optable,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/medical) @@ -1399,7 +1399,7 @@ "AU" = (/obj/machinery/computer/prisoner{tag = "icon-computer (NORTH)"; name = "Implant Management"; icon_state = "computer"; dir = 1},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/shuttle/specops/centcom) "AV" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "specops_shuttle_port"; name = "port docking hatch controller"; pixel_x = 0; pixel_y = -25; tag_door = "specops_shuttle_port_hatch"},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/shuttle/specops/centcom) "AW" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/shuttle/specops/centcom) -"AX" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/weapon/gun/energy/pulse_rifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"AX" = (/obj/structure/sign/nanotrasen,/turf/unsimulated/wall,/area/centcom/specops) "AY" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "AZ" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "Ba" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -1444,7 +1444,7 @@ "BN" = (/obj/structure/closet/wardrobe/ert,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "BO" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "BP" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "specops_centcom_dock"; name = "docking port controller"; pixel_x = 0; pixel_y = 25; req_one_access = list(103); tag_door = "specops_centcom_dock_door"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"BQ" = (/obj/structure/sign/nanotrasen,/turf/unsimulated/wall{icon = 'icons/turf/transit_vr.dmi'},/area/centcom/specops) +"BQ" = (/obj/structure/table/reinforced,/obj/item/ammo_casing/nsfw_batt/stun,/obj/item/ammo_casing/nsfw_batt/stun,/obj/item/ammo_casing/nsfw_batt/stun,/obj/item/ammo_casing/nsfw_batt,/obj/item/ammo_casing/nsfw_batt,/obj/item/ammo_casing/nsfw_batt,/obj/item/ammo_casing/nsfw_batt/net,/obj/item/ammo_casing/nsfw_batt/net,/obj/item/ammo_magazine/nsfw_mag,/obj/item/weapon/gun/projectile/nsfw,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "BR" = (/obj/machinery/door/blast/regular{name = "When Everything else fails."},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "BS" = (/obj/effect/floor_decal/corner/white{tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "BT" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -1459,7 +1459,6 @@ "Cc" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor/steel,/area/centcom/specops) "Cd" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/weapon/pinpointer/advpinpointer,/obj/item/weapon/stamp/centcomm,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "Ce" = (/obj/machinery/door/airlock/centcom{name = "Commander"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) -"Cf" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/deagle/camo,/obj/item/ammo_magazine/m50,/obj/item/ammo_magazine/m50,/obj/item/ammo_magazine/m50,/obj/item/ammo_magazine/m50,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "Cg" = (/obj/structure/sign/securearea{name = "ENGINEERING ACCESS"; pixel_y = -32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "Ch" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/turf/unsimulated/floor/steel{icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood"},/area/centcom/specops) "Ci" = (/obj/effect/floor_decal/corner/yellow{dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -1556,22 +1555,22 @@ aaababababababababababababababababababababababababababababababababababababababab aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacaa aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacaceZeZeZeZeZeZeZeZeZeZeZeZeZeZeZ aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacaceZjyjTjTjTjTjTjTjTjTjTjTkokoeZ -aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpkpkpkpkpkpkpkpkpkpkpkpkpkpkXkZkYnunununununNApnOjTkoeZ -aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpkpkpkpkpkpkpkpkpkpkpkpkpAqAsArAuAtAwAvAyAxAAAzACABkpkXAEADAFAFAFAFAFAFAFAGAHkoeZ -aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpAIkokpAKAJAMALAOANAQAPARAqkokokokokokokokokokokokokpkXAEASAUATATAVAFAFAWnOjTkoeZ -aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpAXkokpAZAYAYAYAYAYAYAYBaAqBbkokoBcBeBdBgBfBhkokoBikpBjjTjTjTjTjTjTBkBkjTjTkokoeZ -aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpBlkoAqBmAYBoBnBqBpBrAYBskpkokokoBtBvBuBxBwBykokoBzkpkpkpkpkpkpkpkpBABAkpkokokoeZ -aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpBBkoAqBCAYBEBDBGBFBHAYBIkpBKBJkokokokokokokokokoBLkpBMBNBNBNBOkpBPAYAYkpkpkpkpeZ -aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacackpBQBRAqAqBSBSBSBSBSBSBSAqkpkpkpBTBTBTBTBTBTBTBTkpkpkpBUBVBVBVBUkpAYAYAYkpBWBYBXeZ +aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAqAqAqAqAqAqAqAqAqAqAqAqAqkXkZkYnunununununNApnOjTkoeZ +aaabababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAqAqAqAqAqAqAqAqAqAqAqAqAqAsArAuAtAwAvAyAxAAAzACABAqkXAEADAFAFAFAFAFAFAFAGAHkoeZ +aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAIkoAqAKAJAMALAOANAQAPARAqkokokokokokokokokokokokoAqkXAEASAUATATAVAFAFAWnOjTkoeZ +aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqkpkoAqAZAYAYAYAYAYAYAYBaAqBbkokoBcBeBdBgBfBhkokoBiAqBjjTjTjTjTjTjTBkBkjTjTkokoeZ +aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqBlkoAqBmAYBoBnBqBpBrAYBsAqkokokoBtBvBuBxBwBykokoBzAqAqAqAqAqAqAqAqBABAAqkokokoeZ +aaababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqBBkoAqBCAYBEBDBGBFBHAYBIAqBKBJkokokokokokokokokoBLAqBMBNBNBNBOAqBPAYAYAqAqAqAqeZ +aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAXBRAqAqBSBSBSBSBSBSBSAqAqAqAqBTBTBTBTBTBTBTBTAqAqAqBUBVBVBVBUAqAYAYAYAqBWBYBQeZ aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAYBZAYAYAYAYAYAYAYBZAYAYCaAYAYAYAYAYAYAYAYCaAYBUBUCbCbCbBUBUAYAYAYCcBUBUCdeZ -aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYBUBUBUBUBUBUBUAYAYAYCeBUBUCfeZ +aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYAYBUBUBUBUBUBUBUAYAYAYCeBUBUBXeZ aaababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAYCgAYAYAYAYAYAYAYCgAYAYAYAYAYAYAYAYAYAYAYAYAYBUBUCbCbCbBUBUAYAYAYCcBUBUCheZ -aaabababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqAqCiCiCiCiCiCiCiAqAqAqAqCjCjClCkCnCmCjCjAqAqAqBUBVBVBVBUkpAYAYAYkpCoCqCpeZ -aaabababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCrkokokokokokokokokpkokokokoCtCsCvCukokokokoAqCwBNBNBNCxkpAYAYAYkpkpkpkpeZ -aaabababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCykokokoCACzCCCBCBkpCDkokokokokokokokokokoCEAqkpkpkpkpkpkpAYAYAYkpCFCHCGeZ -aaabababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCIkokokoCKCJCMCLCNkpCOkokokokokokokokokokoCPAqacacacacackpAYAYAYCQkokokoeZ -aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacadadadadAqacacacacacAqAYAYAqCSCRCUCTCWCVCMCLCNkpCYCXDaCZDcDbDeDdDgDfDiDhAqacacacacackpAYAYAYDjkokokoeZ -aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacadadadadadadadadadadadadadadadadadadadagahagAqkpkpkpkpkpBQDkDkAqaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaf +aaabababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqAqCiCiCiCiCiCiCiAqAqAqAqCjCjClCkCnCmCjCjAqAqAqBUBVBVBVBUAqAYAYAYAqCoCqCpeZ +aaabababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCrkokokokokokokokoAqkokokokoCtCsCvCukokokokoAqCwBNBNBNCxAqAYAYAYAqAqAqAqeZ +aaabababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCykokokoCACzCCCBCBAqCDkokokokokokokokokokoCEAqAqAqAqAqAqAqAYAYAYAqCFCHCGeZ +aaabababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacAqAYAYAqCIkokokoCKCJCMCLCNAqCOkokokokokokokokokokoCPAqacacacacacAqAYAYAYCQkokokoeZ +aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacadadadadAqacacacacacAqAYAYAqCSCRCUCTCWCVCMCLCNAqCYCXDaCZDcDbDeDdDgDfDiDhAqacacacacacAqAYAYAYDjkokokoeZ +aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacadadadadadadadadadadadadadadadadadadadagahagAqAqAqAqAqAqAXDkDkAqaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaf aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacadagahahahaiahahahahahahahahahahaiahahahahahDmDlDlDlDlDlDlDlDlDnaeajakakakalamanaoapapaeaqarasatauavawaxayaeazaAaBaCaDaEaFaeaGaHaIaJaKaLaf aaababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacadahahahahahahahahahahahahahahahahahahahahahDmDlDlDlDlDlDlDlDlDnaeajakakakakakakakakakaeaMaraNaNaraMaMaMaMaeaOaPaQaQaQaRaSaTaUaVaWaXaYaYaf aaabababababababababababababababababababababababababababababababababababacacaZaZaZaZaZaZaZaZacacacacacadahahahahahahahahahahahahahahahahahahahahahAqaeaeaeaeaeaeaeaeaeaeaeaeaeaeaebaaeaeakakaeaMaMaMaMaMaMaMaMaMaeaObbbcbdbebfbgaTbdbdbdbdbdbdaf diff --git a/maps/tether/tether-08-ships.dmm b/maps/tether/tether-08-ships.dmm index 76968962df..fd41acbeda 100644 --- a/maps/tether/tether-08-ships.dmm +++ b/maps/tether/tether-08-ships.dmm @@ -259,6 +259,7 @@ "eY" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel_reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/turf/simulated/floor/tiled/techfloor,/area/houseboat/cargo) "eZ" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel_reinforced,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/turf/simulated/floor/tiled/techfloor,/area/houseboat/cargo) "fa" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/structure/table/steel_reinforced,/obj/item/stack/material/plastic,/obj/item/stack/material/plastic,/turf/simulated/floor/tiled/techfloor,/area/houseboat/cargo) +"fb" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/secure/briefcase/nsfw_pack,/turf/simulated/floor/tiled/techfloor,/area/houseboat/bridge) (1,1,1) = {" aaabababababaaabababababaaabababababaaabababababaaabababababaaacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac @@ -286,7 +287,7 @@ acacacacacacacacacacacacacacacacacacacacacacacblbnbobpbqbrbsblblacacacacacblbmbm acacacacacacacacacacacacacacacacacblbmbmbmbmbmblbtbubvbwbxbyblbnbmbmbmbnblbnbzbAbBbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac acacacacacacacacacacacacacacacacblblbEbFbGbHbIblbJbKbLbLbLbMblbNbObPbQbRbSbTbUbUbVbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac acacacacacacacblblbnbmbmbmbmbmbmblblbWbXbXbXbYblbZcacbcccacdblcecfcgchblcicjckclcmbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac -acacacacacacblblcnblcocpcpcqcrcrcsblctcucvcwcxblblbRcyblblblblcecgcgczcAclclclcBbnblblacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac +acacacacacacblblfbblcocpcpcqcrcrcsblctcucvcwcxblblbRcyblblblblcecgcgczcAclclclcBbnblblacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac acacacacacblblcCcDblcEcpcpcpcFcFcGblblbRcybRblblcHcIcJcIcKcLcMcNcgcgcOblcPcQcRcSblbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac acacacacaccTcUcVcVblcWcpcpcXcYcYcsblcZcZcZcZcZbldadbdcdddedfdgdhcgcgdiblblblblblbnbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac acacacacaccTdjdkdlbnblblcyblblblblbncZcZcZcZcZcAdmdbdndodpdpbRdqcgcgdrbldsdtdudvdwbCbDacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac diff --git a/vorestation.dme b/vorestation.dme index 40a1283418..a66bcda17c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2404,6 +2404,7 @@ #include "code\modules\vore\fluffstuff\custom_permits_vr.dm" #include "code\modules\vore\fluffstuff\guns\bsharpoon.dm" #include "code\modules\vore\fluffstuff\guns\dominator.dm" +#include "code\modules\vore\fluffstuff\guns\nsfw.dm" #include "code\modules\vore\fluffstuff\guns\protector.dm" #include "code\modules\vore\fluffstuff\guns\pummeler.dm" #include "code\modules\vore\fluffstuff\guns\sickshot.dm"