cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #893 from Cameron653/master

Browse Source 
Polaris Feburary Syncs
This commit is contained in:
Arokha Sieyes
2017-02-02 23:06:13 -05:00
committed by GitHub
parent 380eee789d 4a0913076c
commit 94b621b310
252 changed files with 4327 additions and 1540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+3 -3
View File
@@ -151,7 +151,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(
/obj/item/weapon/tank/emergency_oxygen,
/obj/item/weapon/tank/emergency/oxygen,
/obj/item/device/flashlight,
/obj/item/weapon/gun/energy,
/obj/item/weapon/gun/projectile,
@@ -221,7 +221,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(
/obj/item/weapon/tank/emergency_oxygen,
/obj/item/weapon/tank/emergency/oxygen,
/obj/item/device/flashlight,
/obj/item/weapon/gun/energy,
/obj/item/weapon/gun/projectile,
@@ -885,7 +885,7 @@
icon_state = "octavgentlecoat"
item_state = "octavgentlecoat_mob"
blood_overlay_type = "coat"
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light)
allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light)
//bwoincognito:Octavious Ward
/obj/item/clothing/under/det/fluff/octavious