diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 056d9f72955..4f5a3e6988f 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -37,7 +37,7 @@ /obj/effect/overlay/bluespacify name = "Bluespace" - icon = 'icons/turf/space.dmi' + icon = 'icons/turf/space_vr.dmi' //VOREStation Edit icon_state = "bluespacify" plane = ABOVE_PLANE diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index b0006888bd0..a45cb5946f6 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -4,7 +4,7 @@ name = "AR Overlay (Civ)" desc = "Provides a general identification and health status overlay on your vision with no frills." list_pos = NIF_CIVILIAN_AR - cost = 500 + cost = 250 a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED) vision_flags = (NIF_V_AR_CIVILIAN) @@ -14,7 +14,7 @@ name = "AR Overlay (Med)" desc = "Like the civilian model, but provides medical records access and virus database lookup." list_pos = NIF_MEDICAL_AR - cost = 750 + cost = 375 access = access_medical a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED) @@ -25,7 +25,7 @@ name = "AR Overlay (Sec)" desc = "Like the civilian model, but provides access to arrest status and security records." list_pos = NIF_SECURITY_AR - cost = 750 + cost = 375 access = access_security a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED) @@ -36,7 +36,7 @@ name = "AR Overlay (Eng)" desc = "Like the civilian model, but provides station alert notices." list_pos = NIF_ENGINE_AR - cost = 750 + cost = 375 access = access_engine a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED) @@ -47,7 +47,7 @@ name = "AR Overlay (Sci)" desc = "Like the civilian model, but provides ... well, nothing. For now." list_pos = NIF_SCIENCE_AR - cost = 750 + cost = 375 access = access_research a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED) @@ -58,7 +58,7 @@ name = "AR Overlay (Omni)" desc = "Like the civilian model, but provides most of the features of the medical and security overlays as well." list_pos = NIF_OMNI_AR - cost = 750 + cost = 375 access = access_captain a_drain = 0.01 planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED) @@ -71,7 +71,7 @@ name = "Corrective AR" desc = "Subtly alters perception to compensate for cataracts and retinal misalignment, among other common disabilities." list_pos = NIF_CORRECTIVE_GLASS - cost = 200 + cost = 100 a_drain = 0.025 vision_flags = (NIF_V_CORRECTIVE) @@ -79,7 +79,7 @@ name = "Nictating Membrane" desc = "A synthetic nictating membrane (aka 'third eyelid') that protects the eyes from UV or hostile atmospheres. Does not protect from photonic stun weapons." list_pos = NIF_UVFILTER - cost = 450 + cost = 225 a_drain = 0.2 vision_flags = (NIF_V_UVFILTER) @@ -87,7 +87,7 @@ name = "Responsive Filter" desc = "Enables a high-speed shielding response to intense light, such as flashes, to block them." list_pos = NIF_FLASHPROT - cost = 600 + cost = 300 access = access_security a_drain = 0.05 vision_flags = (NIF_V_FLASHPROT) @@ -98,7 +98,7 @@ name = "Meson Scanner" desc = "Similar to the worn Optical Meson Scanner Goggles, these allow you to see the base structure and terrain through walls." list_pos = NIF_MESONS - cost = 1000 + cost = 500 a_drain = 0.1 access = access_engine tick_flags = NIF_ACTIVETICK @@ -117,7 +117,7 @@ name = "Material Scanner" desc = "Similar to the worn Optical Material Scanner Goggles, these allow you to see objects through walls." list_pos = NIF_MATERIAL - cost = 1000 + cost = 500 a_drain = 0.1 access = access_research tick_flags = NIF_ACTIVETICK @@ -156,7 +156,7 @@ name = "Low-Light Amp" desc = "Similar to the worn Night Vision Goggles, these allow you to see in complete darkness." list_pos = NIF_NIGHTVIS - cost = 1000 + cost = 500 a_drain = 0.1 access = access_security tick_flags = NIF_ACTIVETICK diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index c7c349560c3..737a45f7e46 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -2,7 +2,7 @@ name = "Medichines" desc = "An internal swarm of nanites to make sure you stay in good shape and to promote healing, or to preserve you if you are critically injured." list_pos = NIF_ORGANIC_HEAL - cost = 2500 + cost = 1250 p_drain = 0.05 a_drain = 0.1 //This is messed with manually below. wear = 2 @@ -75,7 +75,7 @@ name = "Medichines" desc = "A swarm of mechanical repair nanites, able to repair relatively minor damage to synthetic bodies. Large repairs must still be performed manually." list_pos = NIF_SYNTH_HEAL - cost = 2500 + cost = 1250 p_drain = 0.05 a_drain = 0.00 //This is manually drained below. wear = 2 @@ -128,7 +128,7 @@ name = "Respirocytes" desc = "Nanites simulating red blood cells will filter and recycle oxygen for a short time, preventing suffocation in hostile environments. NOTE: Only capable of supplying OXYGEN." list_pos = NIF_SPAREBREATH - cost = 650 + cost = 325 p_drain = 0.05 a_drain = 0.1 wear = 2 @@ -183,7 +183,7 @@ name = "Mind Backup" desc = "Backup your mind on the go. Stores a one-time sync of your current mindstate upon activation." list_pos = NIF_BACKUP - cost = 250 + cost = 125 activate() if((. = ..())) diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm index ad1140933db..7c911623402 100644 --- a/code/modules/nifsoft/software/06_screens.dm +++ b/code/modules/nifsoft/software/06_screens.dm @@ -3,7 +3,7 @@ desc = "A link to the local crew monitor sensors. Useful for finding people in trouble." list_pos = NIF_MEDMONITOR access = access_medical - cost = 1250 + cost = 625 p_drain = 0.025 var/datum/nano_module/crew_monitor/arscreen @@ -32,7 +32,7 @@ desc = "A link to the local alarm monitors. Useful for detecting alarms in a pinch." list_pos = NIF_ENGMONITOR access = access_engine - cost = 1250 + cost = 625 p_drain = 0.025 var/datum/nano_module/alarm_monitor/engineering/arscreen diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 011e019fce0..58dc33880e6 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -4,7 +4,7 @@ name = "Commlink" desc = "An internal communicator for keeping in touch with people." list_pos = NIF_COMMLINK - cost = 500 + cost = 250 wear = 0 p_drain = 0.01 other_flags = (NIF_O_COMMLINK) diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 213902c528b..0351c8d19fe 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -2,7 +2,7 @@ name = "APC Connector" desc = "A small attachment that allows synthmorphs to recharge themselves from APCs." list_pos = NIF_APCCHARGE - cost = 1250 + cost = 625 wear = 2 applies_to = NIF_SYNTHETIC tick_flags = NIF_ACTIVETICK @@ -44,7 +44,7 @@ name = "Pressure Seals" desc = "Creates pressure seals around important synthetic components to protect them from vacuum. Almost impossible on organics." list_pos = NIF_PRESSURE - cost = 1750 + cost = 875 a_drain = 0.5 wear = 3 applies_to = NIF_SYNTHETIC @@ -54,7 +54,7 @@ name = "Heat Sinks" desc = "Advanced heat sinks for internal heat storage of heat on a synth until able to vent it in atmosphere." list_pos = NIF_HEATSINK - cost = 1450 + cost = 725 a_drain = 0.25 wear = 3 var/used = 0 @@ -122,7 +122,7 @@ name = "Mass Alteration" desc = "A system that allows one to change their size, through drastic mass rearrangement. Causes significant wear when installed." list_pos = NIF_SIZECHANGE - cost = 750 + cost = 375 wear = 6 activate() @@ -153,7 +153,7 @@ name = "World Bender" desc = "Alters your perception of various objects in the world. Only has one setting for now: displaying all your crewmates as farm animals." list_pos = NIF_WORLDBEND - cost = 200 + cost = 100 a_drain = 0.01 activate() diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index e7868b50699..61b29148289 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -278,8 +278,11 @@ continue if(owner.nutrition > 90 && (M.health < M.maxHealth)) - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) + M.adjustBruteLoss(-2.5) + M.adjustFireLoss(-2.5) + M.adjustToxLoss(-5) + M.adjustOxyLoss(-5) + M.adjustCloneLoss(-1.25) owner.nutrition -= 2 if(M.nutrition <= 400) M.nutrition += 1 diff --git a/icons/turf/space_vr.dmi b/icons/turf/space_vr.dmi new file mode 100644 index 00000000000..a00d0eca06e Binary files /dev/null and b/icons/turf/space_vr.dmi differ diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 0790ba01d61..2ac742e7759 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -109,9 +109,8 @@ teleport_y = 2 teleport_z = Z_LEVEL_SURFACE_LOW -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/Initialize() +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/find_planet() planet = planet_virgo3b - . = ..() /obj/effect/step_trigger/lost_in_space var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out." diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index a809765de32..8e3ccbfcdb8 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -163,9 +163,11 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) // Bluespace jump turf! /turf/space/bluespace name = "bluespace" + icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" /turf/space/bluespace/Initialize() ..() + icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" // Desert jump turf!