cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme
This commit is contained in:
Kelshark
2017-10-17 08:49:37 -04:00
parent 0e45f2cb73 cb89fdde4f
commit 3ab70b7996
364 changed files with 6881 additions and 2642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -20,6 +20,10 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/toxins(src)
return

22
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -369,11 +369,15 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
return
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
icon_state = "black"
@@ -390,9 +394,15 @@
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
return

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
..()
*/
..()