mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
This commit is contained in:
@@ -42,7 +42,7 @@ FIREACT_BURNS(/obj/item/paper,HIGH_CHANCE,TRASH_BURN,BURN_TEMP_PAPER)
|
||||
FIREACT_BURNS(/obj/item/soap,LOW_CHANCE,TRASH_BURN,BURN_TEMP_PAPER)
|
||||
FIREACT_BURNS(/obj/item/storage/pill_bottle,MED_CHANCE,TRASH_BURN,BURN_TEMP_PAPER)
|
||||
FIREACT_BURNS(/obj/item/assembly/mousetrap,HIGH_CHANCE,TRASH_BURN,BURN_TEMP_PAPER)
|
||||
FIREACT_BURNS(/obj/structure/table/,LOW_CHANCE,TRASH_BURN,BURN_TEMP_METAL)
|
||||
FIREACT_BURNS(/obj/structure/table,LOW_CHANCE,TRASH_BURN,BURN_TEMP_METAL)
|
||||
FIREACT_BURNS(/obj/structure/table/standard,LOW_CHANCE,TRASH_BURN,BURN_TEMP_PLASTIC)
|
||||
FIREACT_BURNS(/obj/item/deck,LOW_CHANCE,TRASH_BURN,BURN_TEMP_PAPER)
|
||||
FIREACT_BURNS(/obj/structure/closet,LOW_CHANCE,TRASH_BURN,BURN_TEMP_METAL)
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
)
|
||||
cost = 200
|
||||
containertype = /obj/structure/closet/crate/nanotrasen
|
||||
container name = "Bluespace Fulton kit crate"
|
||||
containername = "Bluespace Fulton kit crate"
|
||||
|
||||
/datum/supply_pack/misc/fulton_surplus
|
||||
name = "Surplus Bluespace Fultons"
|
||||
@@ -50,4 +50,4 @@
|
||||
)
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate/nanotrasen
|
||||
container name = "Surplus Bluespace Fultons crate"
|
||||
containername = "Surplus Bluespace Fultons crate"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
for(var/thing in orange(7, src))
|
||||
if(istype(thing, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/watchers = thing
|
||||
if(watchers in oviewers(7,src) && watchers.species != SPECIES_SHADEKIN) // And they can see us... //CHOMPEDIT - (And aren't themselves a shadekin)
|
||||
if((watchers in oviewers(7,src)) && watchers.species != SPECIES_SHADEKIN) // And they can see us... //CHOMPEDIT - (And aren't themselves a shadekin)
|
||||
if(!(watchers.stat) && !isbelly(watchers.loc) && !istype(watchers.loc, /obj/item/holder)) // And they are alive and not being held by someone...
|
||||
watcher++ // They are watching us!
|
||||
else if(istype(thing, /mob/living/silicon/robot))
|
||||
|
||||
@@ -611,6 +611,7 @@
|
||||
if(transformed)
|
||||
//transformed bellysprites dont exist yet. Uncomment this when they do. -Reo
|
||||
//add_overlay("[iconstate]-t_[belly_class]-[vs_fullness]")
|
||||
pass()
|
||||
else
|
||||
add_overlay("[icon_state]_[belly_class]-[vs_fullness]")
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
minbodytemp = 0
|
||||
heat_damage_per_tick = 0
|
||||
|
||||
projectiletype = /obj/item/projectile/bullet/pistol/medium.
|
||||
projectiletype = /obj/item/projectile/bullet/pistol/medium
|
||||
projectilesound = 'sound/weapons/Gunshot_light.ogg'
|
||||
|
||||
needs_reload = TRUE
|
||||
|
||||
@@ -302,7 +302,7 @@
|
||||
|
||||
/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/verb/change_settings()
|
||||
set name = "Change Settings"
|
||||
set desc = "Change \the [src]'s settings"
|
||||
set desc = "Change the swoopie's settings"
|
||||
set category = "IC"
|
||||
set src in oview(1)
|
||||
if(!has_AI() || !IIsAlly(usr))
|
||||
|
||||
@@ -457,7 +457,7 @@
|
||||
if(prob(2))
|
||||
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
|
||||
if(thalers < 100)
|
||||
|
||||
pass()
|
||||
else if(thalers < 500)
|
||||
owner.custom_pain("<span class='warning'>You feel bloated.</span>",1,TRUE)
|
||||
owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
/obj/machinery/chemical_synthesizer/proc/add_cartridge(obj/item/reagent_containers/chem_disp_cartridge/C, mob/user)
|
||||
if(!panel_open)
|
||||
if(user)
|
||||
to_chat(user, span_warning("\The panel is locked!"))
|
||||
to_chat(user, span_warning("The panel is locked!"))
|
||||
return
|
||||
|
||||
if(!istype(C))
|
||||
|
||||
Reference in New Issue
Block a user