diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index c58377f9577..d6d3aded476 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -204,7 +204,8 @@ list_pos = NIF_THERMALS cost = 1000 a_drain = 0.1 - access = access_captain + illegal = TRUE + access = 999 tick_flags = NIF_ACTIVETICK activate() diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index a4b1007a4df..10e96c7676b 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -989,7 +989,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie ..() //verkister: Cameron Eggbert - Science goggles that ACTUALLY do nothing. -/obj/item/clothing/glasses/science_proper +/obj/item/clothing/glasses/fluff/science_proper name = "Aesthetic Science Goggles" desc = "The goggles really do nothing this time!" icon_state = "purple" @@ -997,12 +997,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie item_flags = AIRTIGHT //verkister: Opie Eggbert - Spiffy fluff goggles -/obj/item/clothing/glasses/spiffygogs +/obj/item/clothing/glasses/fluff/spiffygogs name = "Chad Goggles" desc = "You can almost feel the raw power radiating off these strange specs." icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi' icon_state = "spiffygogs" + slot_flags = SLOT_EYES | SLOT_EARS item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") toggleable = 1 off_state = "spiffygogsup" @@ -1410,4 +1411,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie H.species.give_numbing_bite() //This was annoying, but this is the easiest way of performing it. qdel(src) //One time use. else //If not, do nothing. - to_chat(user,"You are unable to inject other people.") \ No newline at end of file + to_chat(user,"You are unable to inject other people.") diff --git a/config/custom_items.txt b/config/custom_items.txt index 90e934f6392..d735fa8ffbb 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -614,7 +614,7 @@ item_path: /obj/item/clothing/head/fluff/runac { ckey: verkister character_name: Cameron Eggbert -item_path: /obj/item/clothing/glasses/science_proper +item_path: /obj/item/clothing/glasses/fluff/science_proper } { ckey: verkister @@ -624,7 +624,7 @@ item_path: /obj/item/weapon/disk/limb/eggnerdltd { ckey: verkister character_name: Opie Eggbert -item_path: /obj/item/clothing/glasses/spiffygogs +item_path: /obj/item/clothing/glasses/fluff/spiffygogs } { ckey: virgo113 diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index e3eee40d40c..e7afc65c96e 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/maps/tether/tether-01-surface.dmm b/maps/tether/tether-01-surface.dmm index 3ecf5ebf1bd..bab337657f9 100644 --- a/maps/tether/tether-01-surface.dmm +++ b/maps/tether/tether-01-surface.dmm @@ -3311,7 +3311,7 @@ "blI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake) "blJ" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/atmospherics/pipe/cap/visible{tag = "icon-cap (NORTH)"; icon_state = "cap"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos) "blK" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/engineering/atmos/intake) -"blL" = (/obj/machinery/atmospherics/pipe/tank/oxygen{dir = 1; start_pressure = 2533.13},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel_dirty,/area/engineering/atmos) +"blL" = (/obj/machinery/atmospherics/pipe/tank/oxygen{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel_dirty,/area/engineering/atmos) "blM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos) "blN" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/atmospherics/pipe/manifold4w/visible/black,/obj/machinery/meter,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/processing) "blO" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 4},/obj/machinery/door/firedoor,/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/turf/simulated/floor/plating,/area/engineering/atmos/processing) diff --git a/vorestation.dme b/vorestation.dme index 70bd810ea63..f2a39aafc69 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1952,7 +1952,6 @@ #include "code\modules\mob\living\simple_animal\animals\pike_vr.dm" #include "code\modules\mob\living\simple_animal\animals\slime.dm" #include "code\modules\mob\living\simple_animal\animals\snake_vr.dm" -#include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\animals\spiderbot.dm" #include "code\modules\mob\living\simple_animal\animals\tomato.dm" #include "code\modules\mob\living\simple_animal\animals\tree.dm" @@ -1982,6 +1981,7 @@ #include "code\modules\mob\living\simple_animal\vore\horse.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm" #include "code\modules\mob\living\simple_animal\vore\snake.dm" +#include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\vore\wah.dm" #include "code\modules\mob\living\simple_animal\vore\wolf.dm" #include "code\modules\mob\living\simple_animal\vore\zz_vore_overrides.dm"