cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves compile errors with the exception of map errors.

Browse Source
This commit is contained in:
Cameron653
2019-01-12 21:09:29 -05:00
parent fb6f5e33ca
commit 9dd973221d
140 changed files with 1223 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
code/game/objects/structures/crates_lockers/largecrate_vr.dm
View File

@@ -1,3 +1,4 @@
//VORESTATION AI TEMPORARY REMOVAL. Commented out until vore mobs are fixed.
/obj/structure/largecrate/birds //This is an awful hack, but it's the only way to get multiple mobs spawned in one crate.
name = "Bird crate"
desc = "You hear chirping and cawing inside the crate. It sounds like there are a lot of birds in there..."
@@ -5,28 +6,28 @@
/obj/structure/largecrate/birds/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(W.is_crowbar())
new /obj/item/stack/material/wood(src)
new /mob/living/simple_animal/bird(src)
new /mob/living/simple_animal/bird/kea(src)
new /mob/living/simple_animal/bird/eclectus(src)
new /mob/living/simple_animal/bird/greybird(src)
new /mob/living/simple_animal/bird/eclectusf(src)
new /mob/living/simple_animal/bird/blue_caique(src)
new /mob/living/simple_animal/bird/white_caique(src)
new /mob/living/simple_animal/bird/green_budgerigar(src)
new /mob/living/simple_animal/bird/blue_Budgerigar(src)
new /mob/living/simple_animal/bird/bluegreen_Budgerigar(src)
new /mob/living/simple_animal/bird/commonblackbird(src)
new /mob/living/simple_animal/bird/azuretit(src)
new /mob/living/simple_animal/bird/europeanrobin(src)
new /mob/living/simple_animal/bird/goldcrest(src)
new /mob/living/simple_animal/bird/ringneckdove(src)
new /mob/living/simple_animal/bird/cockatiel(src)
new /mob/living/simple_animal/bird/white_cockatiel(src)
new /mob/living/simple_animal/bird/yellowish_cockatiel(src)
new /mob/living/simple_animal/bird/grey_cockatiel(src)
new /mob/living/simple_animal/bird/too(src)
new /mob/living/simple_animal/bird/hooded_too(src)
new /mob/living/simple_animal/bird/pink_too(src)
new /mob/living/simple_mob/bird(src)
new /mob/living/simple_mob/bird/kea(src)
new /mob/living/simple_mob/bird/eclectus(src)
new /mob/living/simple_mob/bird/greybird(src)
new /mob/living/simple_mob/bird/eclectusf(src)
new /mob/living/simple_mob/bird/blue_caique(src)
new /mob/living/simple_mob/bird/white_caique(src)
new /mob/living/simple_mob/bird/green_budgerigar(src)
new /mob/living/simple_mob/bird/blue_Budgerigar(src)
new /mob/living/simple_mob/bird/bluegreen_Budgerigar(src)
new /mob/living/simple_mob/bird/commonblackbird(src)
new /mob/living/simple_mob/bird/azuretit(src)
new /mob/living/simple_mob/bird/europeanrobin(src)
new /mob/living/simple_mob/bird/goldcrest(src)
new /mob/living/simple_mob/bird/ringneckdove(src)
new /mob/living/simple_mob/bird/cockatiel(src)
new /mob/living/simple_mob/bird/white_cockatiel(src)
new /mob/living/simple_mob/bird/yellowish_cockatiel(src)
new /mob/living/simple_mob/bird/grey_cockatiel(src)
new /mob/living/simple_mob/bird/too(src)
new /mob/living/simple_mob/bird/hooded_too(src)
new /mob/living/simple_mob/bird/pink_too(src)
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
if(AM.simulated) AM.forceMove(T)
@@ -39,40 +40,40 @@
/obj/structure/largecrate/animal/pred
name = "Predator carrier"
starts_with = list(/mob/living/simple_animal/catgirl)
starts_with = list(/mob/living/simple_mob/catgirl)
/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time.
starts_with = list(pick(/mob/living/simple_animal/retaliate/bee,
/mob/living/simple_animal/catgirl;3,
/mob/living/simple_animal/hostile/frog,
/mob/living/simple_animal/horse,
/mob/living/simple_animal/hostile/panther,
/mob/living/simple_animal/hostile/giant_snake,
/mob/living/simple_animal/hostile/wolf,
/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/hostile/mimic,
/mob/living/simple_animal/hostile/rat,
/mob/living/simple_animal/hostile/rat/passive,
/mob/living/simple_animal/otie;0.5))
starts_with = list(pick(/mob/living/simple_mob/retaliate/bee,
/mob/living/simple_mob/catgirl;3,
/mob/living/simple_mob/hostile/frog,
/mob/living/simple_mob/horse,
/mob/living/simple_mob/hostile/panther,
/mob/living/simple_mob/hostile/giant_snake,
/mob/living/simple_mob/hostile/wolf,
/mob/living/simple_mob/hostile/bear;0.5,
/mob/living/simple_mob/hostile/bear/brown;0.5,
/mob/living/simple_mob/hostile/carp,
/mob/living/simple_mob/hostile/mimic,
/mob/living/simple_mob/hostile/rat,
/mob/living/simple_mob/hostile/rat/passive,
/mob/living/simple_mob/otie;0.5))
return ..()
/obj/structure/largecrate/animal/dangerous
name = "Dangerous Predator carrier"
starts_with = list(/mob/living/simple_animal/hostile/alien)
starts_with = list(/mob/living/simple_mob/hostile/alien)
/obj/structure/largecrate/animal/dangerous/initialize()
starts_with = list(pick(/mob/living/simple_animal/hostile/carp/pike,
/mob/living/simple_animal/hostile/deathclaw,
/mob/living/simple_animal/hostile/dino,
/mob/living/simple_animal/hostile/alien,
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/simple_animal/hostile/alien/queen,
/mob/living/simple_animal/otie/feral,
/mob/living/simple_animal/otie/red,
/mob/living/simple_animal/hostile/corrupthound))
starts_with = list(pick(/mob/living/simple_mob/hostile/carp/pike,
/mob/living/simple_mob/hostile/deathclaw,
/mob/living/simple_mob/hostile/dino,
/mob/living/simple_mob/hostile/alien,
/mob/living/simple_mob/hostile/alien/drone,
/mob/living/simple_mob/hostile/alien/sentinel,
/mob/living/simple_mob/hostile/alien/queen,
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/hostile/corrupthound))
return ..()
/obj/structure/largecrate/animal/guardbeast
@@ -80,31 +81,31 @@
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_animal/otie/security)
starts_with = list(/mob/living/simple_mob/otie/security)
/obj/structure/largecrate/animal/guardmutant
name = "VARMAcorp autoNOMous security solution for hostile environments."
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_animal/otie/security/phoron)
starts_with = list(/mob/living/simple_mob/otie/security/phoron)
/obj/structure/largecrate/animal/otie
name = "VARMAcorp adoptable reject (Dangerous!)"
desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!"
icon = 'icons/obj/storage_vr.dmi'
icon_state = "otiecrate2"
starts_with = list(/mob/living/simple_animal/otie/cotie)
starts_with = list(/mob/living/simple_mob/otie/cotie)
var/taped = 1
/obj/structure/largecrate/animal/otie/phoron
name = "VARMAcorp adaptive beta subject (Experimental)"
desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
starts_with = list(/mob/living/simple_animal/otie/cotie/phoron)
starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
/obj/structure/largecrate/animal/otie/phoron/initialize()
starts_with = list(pick(/mob/living/simple_animal/otie/cotie/phoron;2,
/mob/living/simple_animal/otie/red/friendly;0.5))
starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2,
/mob/living/simple_mob/otie/red/friendly;0.5))
return ..()
/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao
@@ -117,19 +118,19 @@
/obj/structure/largecrate/animal/catgirl
name = "Catgirl Crate"
desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it."
starts_with = list(/mob/living/simple_animal/catgirl)
starts_with = list(/mob/living/simple_mob/catgirl)
/obj/structure/largecrate/animal/wolfgirl
name = "Wolfgirl Crate"
desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out."
starts_with = list(/mob/living/simple_animal/retaliate/wolfgirl)
starts_with = list(/mob/living/simple_mob/retaliate/wolfgirl)
/obj/structure/largecrate/animal/fennec
name = "Fennec Crate"
desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?"
starts_with = list(/mob/living/simple_animal/fennec)
starts_with = list(/mob/living/simple_mob/fennec)
/obj/structure/largecrate/animal/fennec/initialize()
starts_with = list(pick(/mob/living/simple_animal/fennec,
/mob/living/simple_animal/retaliate/fennix;0.5))
starts_with = list(pick(/mob/living/simple_mob/fennec,
/mob/living/simple_mob/retaliate/fennix;0.5))
return ..()