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

Merge pull request #1756 from Verkister/cargoandborgo

Browse Source 
Cargo and borgo stuffs. [change check a whole week overdue!]
This commit is contained in:
Spades
2017-07-02 02:20:25 -04:00
committed by GitHub
parent 64eb12fd9c e2c749288d
commit 36f32b1ab6
7 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/science_vr.dm
+12 -2
View File
@@ -26,7 +26,8 @@
/obj/item/weapon/disk/limb/dsi_sergal,
/obj/item/weapon/disk/limb/dsi_nevrean,
/obj/item/weapon/disk/limb/dsi_vulpkanin,
/obj/item/weapon/disk/limb/dsi_akula
/obj/item/weapon/disk/limb/dsi_akula,
/obj/item/weapon/disk/limb/eggnerdltd
)
cost = 40
containertype = /obj/structure/closet/crate/secure
@@ -55,4 +56,13 @@
containertype = /obj/structure/largecrate/animal/dangerous
containername = "EXTREMELY Dangerous Predator crate"
access = access_xenobiology
contraband = 1
contraband = 1
/datum/supply_packs/sci/guardbeast
name = "V.A.R.M.A.corp autoNOMous security solution"
cost = 199
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/structures/crates_lockers/largecrate_vr.dm
+10 -1
View File
@@ -53,6 +53,8 @@
/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/frond;0.5,
/mob/living/simple_animal/otie/frond/cotie;0.5,
/mob/living/simple_animal/hostile/mimic)
..()
@@ -70,4 +72,11 @@
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/simple_animal/hostile/alien/queen)
..()
..()
/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."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
held_type = /mob/living/simple_animal/otie/frond/security
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+3 -1
View File
@@ -461,7 +461,7 @@
user << "<span class='warning'>Your [src.name] is full. Eject or process contents to continue.</span>"
return
if(istype(target, /obj/item))
if(istype(target, /obj/item) || istype(target, /obj/effect/decal/remains))
var/obj/target_obj = target
if(target_obj.w_class > ITEMSIZE_LARGE)
user << "<span class='warning'>\The [target] is too large to fit into your [src.name]</span>"
@@ -492,6 +492,8 @@
processing_objects.Add(src)
user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
playsound(hound, 'sound/vore/gulp.ogg', 80, 1)
hound.sleeper_r = 1
hound.updateicon()
return
return
//Marking shit changed again because the random travis bug is having its shenanigans again \o/
code/modules/mob/living/simple_animal/vore/otie.dm
+13 -16
View File
@@ -1,4 +1,4 @@
/mob/living/simple_animal/otie //Spawn this one only if you're looking for a bad time.
/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."
icon = 'icons/mob/vore64x32.dmi'
@@ -8,8 +8,8 @@
icon_rest = "otie_rest"
faction = "otie"
recruitable = 1
maxHealth = 120
health = 120
maxHealth = 100
health = 100
minbodytemp = 200
move_to_delay = 4
hostile = 1
@@ -43,15 +43,12 @@
var/mob/living/carbon/human/friend
var/tamed = 0
/mob/living/simple_animal/otie/fluff
/mob/living/simple_animal/otie/frond //gets the pet2tame feature. starts out hostile tho so get gamblin'
name = "otie"
desc = "The classic bioengineered longdog. This one might even tolerate you!"
icon_state = "otie"
icon_living = "otie"
icon_rest = "otie_rest"
faction = "neutral"
/mob/living/simple_animal/otie/fluff/cotie
/mob/living/simple_animal/otie/frond/cotie //same as above but has a little collar :v
name = "tamed otie"
desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. However a proper domesticated otie is an oxymoron and the collar is likely just a decoration."
icon_state = "cotie"
@@ -59,7 +56,7 @@
icon_rest = "cotie_rest"
faction = "neutral"
/mob/living/simple_animal/otie/fluff/security
/mob/living/simple_animal/otie/frond/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho.
name = "guard otie"
desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs."
icon_state = "sotie"
@@ -68,7 +65,7 @@
icon_dead = "sotie-dead"
faction = "neutral"
tamed = 1
maxHealth = 150
maxHealth = 150 //armored or something
health = 150
loot_list = list(/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/clothing/suit/armor/vest/alt)
@@ -99,7 +96,7 @@
else
return found_atom
/mob/living/simple_animal/otie/fluff/security/Found(var/atom/found_atom)
/mob/living/simple_animal/otie/frond/security/Found(var/atom/found_atom)
if(!SA_attackable(found_atom))
return null
if(istype(found_atom,/mob/living/simple_animal/mouse))
@@ -120,12 +117,12 @@
else
return found_atom
/mob/living/simple_animal/otie/fluff/security/proc/check_threat(var/mob/living/M)
/mob/living/simple_animal/otie/frond/security/proc/check_threat(var/mob/living/M)
if(!M || !ishuman(M) || M.stat == DEAD || src == M)
return 0
return M.assess_perp(0, 0, 0, check_records, check_arrest)
/mob/living/simple_animal/otie/fluff/security/set_target(var/mob/M)
/mob/living/simple_animal/otie/frond/security/set_target(var/mob/M)
ai_log("SetTarget([M])",2)
if(!M || (world.time - last_target_time < 5 SECONDS) && target_mob)
ai_log("SetTarget() can't set it again so soon",3)
@@ -153,7 +150,7 @@
return 0
/mob/living/simple_animal/otie/fluff/security/proc/target_name(mob/living/T)
/mob/living/simple_animal/otie/frond/security/proc/target_name(mob/living/T)
if(ishuman(T))
var/mob/living/carbon/human/H = T
return H.get_id_name("unidentified person")
@@ -161,7 +158,7 @@
//Basic friend AI
/mob/living/simple_animal/otie/fluff/Life()
/mob/living/simple_animal/otie/frond/Life()
. = ..()
if(!. || ai_inactive || !friend) return
@@ -222,4 +219,4 @@
vore_capacity = 1
vore_escape_chance = 8
vore_pounce_chance = 16
vore_icons = SA_ICON_LIVING
vore_icons = SA_ICON_LIVING
icons/mob/widerobot_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 210 KiB

icons/obj/storage_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 854 B

vorestation.dme
+1
View File
@@ -1934,6 +1934,7 @@
#include "code\modules\mob\living\simple_animal\vore\dragon.dm"
#include "code\modules\mob\living\simple_animal\vore\frog.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"