cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2195 from Verkister/returnofthelongpup

Browse Source 
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
This commit is contained in:
Spades
2017-10-03 22:31:24 -04:00
committed by GitHub
parent 45e6087f24 3ef9e21923
commit 54d4069eff
6 changed files with 66 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,19 +69,19 @@
/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/hostile/alien/queen,
/mob/living/simple_animal/otie/feral)
..()
/* // 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."
name = "VARMAcorp autoNOMous security solution"
desc = "The VARMAcorp 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/friendly/security
/obj/structure/largecrate/animal/otie
name = "V.A.R.M.A.corp adoptable reject (Dangerous!)"
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"
@@ -93,5 +93,4 @@
playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
icon_state = "otiecrate"
taped = 0
..()
*/
..()