cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-13 02:11:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

GB Update

Browse Source 
New stuff!
This commit is contained in:
VerySoft
2022-04-04 13:38:08 -04:00
parent 5d24d5b2c3
commit b31ee089ac
10 changed files with 3768 additions and 3276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space Station 13 areas_vr.dm
+3
View File
@@ -50,3 +50,6 @@
/area/holodeck/source_patient_ward
name = "\improper Holodeck - Patient Ward"
/area/holodeck/the_uwu_zone
name = "\improper Holodeck - Inside"
code/modules/holodeck/HolodeckControl.dm
+2 -1
View File
@@ -72,7 +72,8 @@
var/list/restricted_programs = list(
"Burnoff Test Simulation" = new/datum/holodeck_program(/area/holodeck/source_burntest, list()),
"Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list())
"Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()),
"Inside" = new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
)
/obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)
code/modules/mob/living/carbon/human/human_movement.dm
+1 -1
View File
@@ -127,7 +127,7 @@
. += shoes.slowdown
//VOREStation Addition Start
if(buckled && istype(buckled, /obj/machinery/power/rtg/d_type_reg))
if(buckled && istype(buckled, /obj/machinery/power/rtg/reg))
. += shoes.slowdown
//VOREStation Addition End
code/modules/power/port_gen_vr.dm
+33 -17
View File
@@ -282,16 +282,17 @@
log_and_message_admins("[ADMIN_LOOKUPFLW(Proj.firer)] triggered a kugelblitz core explosion at [x],[y],[z] via projectile.")
asplod()
/obj/machinery/power/rtg/d_type_reg
/obj/machinery/power/rtg/reg
name = "d-type rotary electric generator"
desc = "It looks kind of like a large hamster wheel."
icon = 'icons/obj/power_vrx96.dmi'
icon_state = "reg"
circuit = /obj/item/weapon/circuitboard/machine/reg
circuit = /obj/item/weapon/circuitboard/machine/reg_d
irradiate = FALSE
power_gen = 0
var/default_power_gen = 1000000 //It's big but it gets adjusted based on what you put into it!!!
var/part_mult = 0
var/nutrition_drain = 1
pixel_x = -32
plane = ABOVE_MOB_PLANE
layer = ABOVE_MOB_LAYER
@@ -299,29 +300,29 @@
interact_offline = TRUE
density = FALSE
/obj/machinery/power/rtg/d_type_reg/Initialize()
/obj/machinery/power/rtg/reg/Initialize()
pixel_x = -32
. = ..()
/obj/machinery/power/rtg/d_type_reg/Destroy()
/obj/machinery/power/rtg/reg/Destroy()
. = ..()
/obj/machinery/power/rtg/d_type_reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE)
/obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE)
. = ..()
M.pixel_y = 8
M.visible_message("<span class='notice'>\The [M], hops up onto \the [src] and begins running!</span>")
/obj/machinery/power/rtg/d_type_reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE)
/obj/machinery/power/rtg/reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE)
. = ..()
buckled_mob.pixel_y = initial(buckled_mob.pixel_y)
/obj/machinery/power/rtg/d_type_reg/RefreshParts()
/obj/machinery/power/rtg/reg/RefreshParts()
var/n = 0
for(var/obj/item/weapon/stock_parts/SP in component_parts)
n += SP.rating
part_mult = n
/obj/machinery/power/rtg/d_type_reg/attackby(obj/item/I, mob/user, params)
/obj/machinery/power/rtg/reg/attackby(obj/item/I, mob/user, params)
pixel_x = -32
if(default_deconstruction_screwdriver(user, I))
return
@@ -329,7 +330,7 @@
return
return ..()
/obj/machinery/power/rtg/d_type_reg/update_icon()
/obj/machinery/power/rtg/reg/update_icon()
pixel_x = -32
if(panel_open)
icon_state = "reg-o"
@@ -338,7 +339,7 @@
else
icon_state = "reg"
/obj/machinery/power/rtg/d_type_reg/process()
/obj/machinery/power/rtg/reg/process()
..()
if(buckled_mobs && buckled_mobs.len > 0)
for(var/mob/living/L in buckled_mobs)
@@ -347,7 +348,7 @@
power_gen = 0
update_icon()
/obj/machinery/power/rtg/d_type_reg/proc/runner_process(var/mob/living/runner)
/obj/machinery/power/rtg/reg/proc/runner_process(var/mob/living/runner)
if(runner.stat != CONSCIOUS)
unbuckle_mob(runner)
runner.visible_message("<span class='warning'>\The [runner], topples off of \the [src]!</span>")
@@ -381,16 +382,31 @@
if(part_mult > 1)
cool_rotations += (cool_rotations * (part_mult - 1)) / 4
power_gen = cool_rotations
runner.nutrition --
runner.nutrition -= nutrition_drain
/obj/machinery/power/rtg/d_type_reg/emp_act(severity)
/obj/machinery/power/rtg/reg/emp_act(severity)
return
/obj/item/weapon/circuitboard/machine/reg
name = T_BOARD("REG")
build_path = /obj/machinery/power/rtg/d_type_reg
/obj/item/weapon/circuitboard/machine/reg_d
name = T_BOARD("D-Type-REG")
build_path = /obj/machinery/power/rtg/reg
board_type = new /datum/frame/frame_types/machine
origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4)
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/stock_parts/capacitor = 1)
/obj/item/weapon/stock_parts/capacitor = 1)
/obj/item/weapon/circuitboard/machine/reg_c
name = T_BOARD("C-Type-REG")
build_path = /obj/machinery/power/rtg/reg/c
board_type = new /datum/frame/frame_types/machine
origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4)
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/stock_parts/capacitor = 1)
/obj/machinery/power/rtg/reg/c
name = "c-type rotary electric generator"
circuit = /obj/item/weapon/circuitboard/machine/reg_c
default_power_gen = 500000 //Half power
nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O
maps/groundbase/gb-misc.dmm
+1944 -1941
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z1.dmm
+258 -378
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z2.dmm
+251 -113
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z3.dmm
+19 -25
View File
@@ -212,6 +212,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/landmark/start/chemist,
/turf/simulated/floor/tiled/virgo3c,
/area/groundbase/medical/patio)
"dW" = (
@@ -259,6 +260,7 @@
/area/groundbase/medical/uhallway)
"fu" = (
/obj/structure/table/bench/marble,
/obj/effect/landmark/start/chemist,
/turf/simulated/floor/tiled/virgo3c,
/area/groundbase/medical/patio)
"fz" = (
@@ -709,10 +711,8 @@
/turf/simulated/floor/wood,
/area/groundbase/medical/cmo)
"nN" = (
/obj/effect/landmark/start{
name = "Explorer"
},
/obj/machinery/light,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"nU" = (
@@ -728,6 +728,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/effect/landmark/start/cmo,
/turf/simulated/floor/wood,
/area/groundbase/medical/cmo)
"og" = (
@@ -902,11 +903,9 @@
/turf/simulated/floor/wood,
/area/groundbase/medical/cmo)
"qA" = (
/obj/effect/landmark/start{
name = "Field Medic"
},
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
/obj/effect/landmark/start/cargo,
/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
/area/groundbase/cargo/office)
"qC" = (
/obj/machinery/station_map{
dir = 8;
@@ -1124,15 +1123,14 @@
/turf/simulated/floor/tiled,
/area/groundbase/civilian/pilot)
"uU" = (
/obj/effect/landmark/start{
name = "Pathfinder"
},
/obj/effect/landmark/start/pf,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"vp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"vu" = (
@@ -1182,6 +1180,7 @@
/obj/structure/bed/chair/comfy/brown{
dir = 1
},
/obj/effect/landmark/start/cmo,
/turf/simulated/floor/wood,
/area/groundbase/medical/cmo)
"wm" = (
@@ -1468,6 +1467,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/landmark/start/cmo,
/turf/simulated/floor/tiled/virgo3c,
/area/groundbase/medical/patio)
"BE" = (
@@ -1572,9 +1572,6 @@
/turf/simulated/floor/tiled,
/area/shuttle/groundbase/exploration)
"Ef" = (
/obj/effect/landmark/start{
name = "Field Medic"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
@@ -1819,6 +1816,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start/fieldmedic,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"HI" = (
@@ -1926,9 +1924,6 @@
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient1)
"IG" = (
/obj/effect/landmark/start{
name = "Explorer"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -2444,19 +2439,15 @@
/obj/structure/bed/chair/office/light{
dir = 4
},
/obj/effect/landmark/start{
name = "Chief Medical Officer"
},
/obj/machinery/button/windowtint{
id = "cmo_office";
pixel_y = -28
},
/obj/effect/landmark/start/cmo,
/turf/simulated/floor/carpet,
/area/groundbase/medical/cmo)
"Tk" = (
/obj/effect/landmark/start{
name = "Pilot"
},
/obj/effect/landmark/start/pilot,
/turf/simulated/floor/tiled,
/area/groundbase/civilian/pilot)
"Ts" = (
@@ -2647,6 +2638,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"WF" = (
@@ -2709,6 +2701,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start/fieldmedic,
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
"YK" = (
@@ -2748,6 +2741,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/effect/landmark/start/paramedic,
/turf/simulated/floor/tiled/virgo3c,
/area/groundbase/medical/patio)
"Zn" = (
@@ -6964,7 +6958,7 @@ qO
qO
aa
NX
qA
KG
IC
Pf
FV
@@ -14209,7 +14203,7 @@ yU
Lf
Lf
Lf
Lf
qA
Lf
Lf
Lf
maps/stellardelight/ship_misc.dmm
+101 -98
View File
@@ -2916,6 +2916,9 @@
icon_state = "white"
},
/area/holodeck/source_patient_ward)
"Ly" = (
/turf/simulated/floor/flesh,
/area/holodeck/the_uwu_zone)
"Me" = (
/turf/simulated/floor/smole/desert,
/area/holodeck/source_smoleworld)
@@ -2968,9 +2971,9 @@
},
/area/holodeck/source_gym)
"PL" = (
/turf/space,
/turf/simulated/floor/holofloor/reinforced,
/area/space)
/turf/simulated/floor/flesh,
/area/holodeck/the_uwu_zone)
"PM" = (
/turf/simulated/floor/smole/megablocks,
/area/holodeck/source_smoleworld)
@@ -16812,16 +16815,16 @@ fz
fz
fS
dB
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
PL
fZ
fZ
fZ
Ly
Ly
Ly
PL
fZ
Ly
xp
ap
ap
@@ -16954,16 +16957,16 @@ ei
ei
fJ
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17096,16 +17099,16 @@ fJ
fz
fS
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17238,16 +17241,16 @@ fJ
ei
fT
dB
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
PL
fZ
fZ
fZ
Ly
Ly
Ly
PL
fZ
Ly
xp
ap
ap
@@ -17380,16 +17383,16 @@ fJ
fA
fU
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17522,16 +17525,16 @@ ei
ei
fJ
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17664,16 +17667,16 @@ fA
fA
fU
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17806,16 +17809,16 @@ bh
aG
aG
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -17948,16 +17951,16 @@ dJ
dK
dK
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
@@ -18090,16 +18093,16 @@ dJ
dJ
dJ
dB
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
fZ
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
Ly
xp
ap
ap
maps/tether/submaps/tether_misc.dmm
+1156 -702
View File
File diff suppressed because it is too large Load Diff