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

various fixes

Browse Source
This commit is contained in:
izac112
2020-05-27 22:43:33 +02:00
parent db8074a64b
commit be538243c1
6 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/clothing/suits/hooded_yw.dm
View File

@@ -3,7 +3,6 @@
desc = "A suit made to keep you nice and toasty on cold winter days. Or at least alive."
icon = 'icons/obj/clothing/suits_yw.dmi'
icon_state = "snowsuit"
override = 1
icon_override = 'icons/obj/clothing/suits_yw.dmi'
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit
allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)

2
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
View File

@@ -241,7 +241,7 @@
user.visible_message("[user] finishes eating \the [target.name].", "<span class='notice'>You finish eating \the [target.name].</span>")
user << "<span class='notice'>You finish off \the [target.name].</span>"
del(target)
var/mob/living/silicon/robot.R = user
var/mob/living/silicon/robot/R = user
R.cell.charge = R.cell.charge + 250
return
if(istype(target,/obj/item/weapon/cell))

2
code/modules/organs/robolimbs_yw.dm
View File

@@ -10,7 +10,7 @@
parts = list(BP_HEAD)
monitor_styles = standard_monitor_styles
/datum/robolimb/S.Ind
/datum/robolimb/s.Ind
company = "S.Ind"
desc = "S.Ind brand prosthetic limbs."
icon = 'icons/mob/human_races/cyberlimbs/S.Ind/sind_main.dmi' //Sprited by: Generalpantsu

2
code/modules/projectiles/projectile/energy_yw.dm
View File

@@ -12,7 +12,7 @@
pass_flags = PASSTABLE | PASSGRILLE
check_armour = "laser"
/obj/item/projectile/energy/gaussweak.
/obj/item/projectile/energy/gaussweak
name = "gauss bolt"
icon = 'icons/obj/projectiles.dmi'
icon_state = "gauss"

8
code/modules/vore/appearance/spider_taur_powers_vr.dm
View File

@@ -3,15 +3,11 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
name = "web bindings"
desc = "A webbed cocoon that completely restrains the wearer."
icon = 'icons/obj/clothing/web.dmi'
icon_state = "web_bindings"
icon_override = 'icons/mob/vore/web.dmi'
item_state = "web_bindings"
override = 1
item_state = "web_bindings_mob"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
/*yw edit start - Teshari Sprite /Commented out until we know this is needed again if it is please just uncomment this, Izac
/obj/item/clothing/suit/straight_jacket/web_bindings/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
if(body_type == SPECIES_TESHARI)

11
code/modules/vore/fluffstuff/custom_clothes_yw.dm
View File

@@ -709,7 +709,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "aurora_glasses"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
override = 1
item_state = "aurora_glasses"
//Strix Hades
@@ -720,7 +719,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "tesh_cloak_cd"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
override = 1
item_state = "tesh_cloak_cd"
/obj/item/clothing/under/seromi/undercoat/fluff/strix
@@ -729,7 +727,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_override = 'icons/vore/custom_onmob_yw.dmi'
icon_state = "tesh_uniform_cd"
override = 1
item_state = "tesh_uniform_cd"
sprite_sheets = list(
SPECIES_TESHARI = 'icons/vore/custom_onmob_yw.dmi'
@@ -741,7 +738,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "tesh_cloak_cco"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
override = 1
item_state = "tesh_cloak_cco"
/obj/item/clothing/under/seromi/undercoat/fluff/strix_cco
@@ -750,7 +746,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_override = 'icons/vore/custom_onmob_yw.dmi'
icon_state = "tesh_uniform_cco"
override = 1
item_state = "tesh_uniform_cco"
sprite_sheets = list(
"Teshari" = 'icons/vore/custom_onmob_yw.dmi'
@@ -887,7 +882,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "tesh_cloak_kita"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
override = 1
item_state = "tesh_cloak_kita"
// ********
@@ -1025,7 +1019,6 @@
icon_state = "jiao_glasses"
off_state = "jiao_glasses_off"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
override = 1
item_state = "jiao_glasses"
species_restricted = list("Akula")
@@ -1157,7 +1150,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "tesh_cloak_saroth"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
override = 1
item_state = "tesh_cloak_saroth"
/obj/item/clothing/accessory/poncho/cloak/fluff/Jaree
@@ -1167,7 +1159,6 @@
icon_state = "jaree_cloak"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
item_state = "jaree_cloak"
override = 1
/obj/item/clothing/head/ushanka/alt/fluff/Jaree
name = "ushanka"
@@ -1246,7 +1237,6 @@
icon_state = "noel_glasses"
off_state = "noel_glasses_off"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
override = 1
item_state = "noel_glasses"
/obj/item/clothing/suit/storage/toggle/hoodie/fluff/noel_hoodie
@@ -1256,7 +1246,6 @@
icon_state = "noel_hoodie"
// "noel_hoodie_open" will be the open state
icon_override = 'icons/vore/custom_onmob_yw.dmi'
//override = 1 //What is this? VS does not have this
item_state = null
/obj/item/clothing/ears/earings/fluff/noel_earings