cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removies oties and outdoors area

Browse Source
This commit is contained in:
Spades
2017-08-26 15:51:37 -04:00
parent b654ff2a08
commit 18ffeefafd
10 changed files with 5236 additions and 5226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/science_vr.dm
+3 -1
View File
@@ -59,9 +59,11 @@
access = access_xenobiology
contraband = 1
/* Removed until Otie code is unfucked.
/datum/supply_packs/sci/otie
name = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
cost = 100
containertype = /obj/structure/largecrate/animal/otie
containername = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
access = access_xenobiology
access = access_xenobiology
*/
code/datums/supplypacks/security_vr.dm
+3 -1
View File
@@ -1,8 +1,10 @@
/* Removed until Otie code is unfucked.
/datum/supply_packs/security/guardbeast
name = "V.A.R.M.A.corp autoNOMous security solution"
cost = 199
cost = 150
containertype = /obj/structure/largecrate/animal/guardbeast
containername = "V.A.R.M.A.corp autoNOMous security solution crate"
access = list(
access_security,
access_xenobiology)
*/
code/game/objects/random/random_vr.dm
+1 -1
View File
@@ -183,7 +183,7 @@
/obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
var/mob = pick(
prob(50);/mob/living/simple_animal/retaliate/gaslamp,
prob(50);/mob/living/simple_animal/otie/feral,
// prob(50);/mob/living/simple_animal/otie/feral, // Removed until Otie code is unfucked.
prob(20);/mob/living/simple_animal/hostile/dino/virgo3b,
prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b)
if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this.
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+4 -2
View File
@@ -53,7 +53,7 @@
/mob/living/simple_animal/hostile/bear;0.5,
/mob/living/simple_animal/hostile/bear/brown;0.5,
/mob/living/simple_animal/hostile/carp,
/mob/living/simple_animal/otie/friendly,
// /mob/living/simple_animal/otie/friendly, // Removed until Otie code is unfucked.
/mob/living/simple_animal/hostile/mimic)
..()
@@ -73,6 +73,7 @@
/mob/living/simple_animal/hostile/alien/queen)
..()
/* // Removed until Otie code is unfucked.
/obj/structure/largecrate/animal/guardbeast
name = "V.A.R.M.A.corp autoNOMous security solution"
desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs."
@@ -93,4 +94,5 @@
playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
icon_state = "otiecrate"
taped = 0
..()
..()
*/
code/modules/mob/living/simple_animal/vore/otie.dm
+2
View File
@@ -1,3 +1,5 @@
// ToDo: Make this code not a fucking snowflaky horrible broken mess. Do not use until it's actually fixed. It's miserably bad right now.
/mob/living/simple_animal/otie //Spawn this one only if you're looking for a bad time. Not friendly.
name = "otie"
desc = "The classic bioengineered longdog."
maps/tether/tether-01-surface.dmm
+5216 -5217
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether.dm
+1 -1
View File
@@ -21,7 +21,7 @@
#include "tether-08-ships.dmm"
#include "tether-09-empty-surface.dmm"
#include "tether-10-empty-space.dmm"
#include "tether-11-wild-surface.dmm"
// #include "tether-11-wild-surface.dmm" // Wilderness stuff removed until mobs can be optimized better.
#define USING_MAP_DATUM /datum/map/tether
maps/tether/tether_defines.dm
+4
View File
@@ -36,6 +36,8 @@
#define Z_LEVEL_SHIPS 12
#define Z_LEVEL_EMPTY_SURFACE 13
#define Z_LEVEL_EMPTY_SPACE 14
// These are still defined here, but the levels have been removed. I could delete these but it will cause compile errors. Don't delete them unless you have to.
#define Z_LEVEL_SURFACE_WILDERNESS_1 15
#define Z_LEVEL_SURFACE_WILDERNESS_2 16
#define Z_LEVEL_SURFACE_WILDERNESS_3 17
@@ -247,6 +249,7 @@
frozen_mobs -= M
frozen_mobs.Cut()
/*
/datum/map_z_level/tether/wilderness/wild_1
z = Z_LEVEL_SURFACE_WILDERNESS_1
@@ -270,6 +273,7 @@
/datum/map_z_level/tether/wilderness/wild_ruins
z = Z_LEVEL_SURFACE_WILDERNESS_RUINS
*/ // Wilderness stuff removed until mobs can be optimized better.
/proc/get_z_level_datum(atom/A)
var/turf/T = get_turf(A)
maps/tether/tether_virgo3b.dm
+2 -2
View File
@@ -14,7 +14,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
Z_LEVEL_SURFACE_MID,
Z_LEVEL_SURFACE_HIGH,
Z_LEVEL_SURFACE_MINE,
Z_LEVEL_SOLARS,
Z_LEVEL_SOLARS/*,
Z_LEVEL_SURFACE_WILDERNESS_1,
Z_LEVEL_SURFACE_WILDERNESS_2,
Z_LEVEL_SURFACE_WILDERNESS_3,
@@ -22,7 +22,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
Z_LEVEL_SURFACE_WILDERNESS_5,
Z_LEVEL_SURFACE_WILDERNESS_6,
Z_LEVEL_SURFACE_WILDERNESS_CRASH,
Z_LEVEL_SURFACE_WILDERNESS_RUINS,
Z_LEVEL_SURFACE_WILDERNESS_RUINS,*/ // Wilderness stuff removed until mobs can be optimized better.
)
planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3b
vorestation.dme
-1
View File
@@ -1965,7 +1965,6 @@
#include "code\modules\mob\living\simple_animal\vore\frog.dm"
#include "code\modules\mob\living\simple_animal\vore\gaslamp.dm"
#include "code\modules\mob\living\simple_animal\vore\horse.dm"
#include "code\modules\mob\living\simple_animal\vore\otie.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\wah.dm"