cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the empty type of /snacks (#26010)

Browse Source 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-29 14:46:04 +00:00
committed by GitHub
parent 2e2569f1db
commit 098b13bb33
222 changed files with 3300 additions and 3347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/organ_datums/heart_datum.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(!linked_organ.owner)
change_beating(FALSE)
/datum/organ/heart/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
/datum/organ/heart/on_prepare_eat(obj/item/food/organ/snorgan)
snorgan.icon_state = linked_organ.dead_icon
/// A subtype that is always beating. Abductor glands and demon hearts use this.
code/modules/surgery/organs/organ_datums/lung_datum.dm
+1 -1
View File
@@ -308,7 +308,7 @@
linked_organ.owner.AdjustLoseBreath(10 SECONDS)
/datum/organ/lungs/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
/datum/organ/lungs/on_prepare_eat(obj/item/food/organ/snorgan)
snorgan.reagents.add_reagent("salbutamol", 5)
code/modules/surgery/organs/organ_datums/organ_datum.dm
+1 -1
View File
@@ -32,5 +32,5 @@
/datum/organ/proc/on_necrotize()
return FALSE
/datum/organ/proc/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
/datum/organ/proc/on_prepare_eat(obj/item/food/organ/snorgan)
return FALSE
code/modules/surgery/organs/organ_internal.dm
+2 -2
View File
@@ -164,7 +164,7 @@
/obj/item/organ/internal/proc/prepare_eat()
if(is_robotic())
return //no eating cybernetic implants!
var/obj/item/food/snacks/organ/S = new
var/obj/item/food/organ/S = new
S.name = name
S.desc = desc
S.icon = icon
@@ -191,7 +191,7 @@
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/food/snacks/S = prepare_eat()
var/obj/item/food/S = prepare_eat()
if(S)
H.drop_item()
H.put_in_active_hand(S)
code/modules/surgery/organs_internal.dm
+2 -2
View File
@@ -388,11 +388,11 @@
name = "implant an organ"
allowed_tools = list(
/obj/item/organ/internal = 100,
/obj/item/food/snacks/organ = 0 // there for the flavor text
/obj/item/food/organ = 0 // there for the flavor text
)
/datum/surgery_step/internal/manipulate_organs/implant/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/food/snacks/organ))
if(istype(tool, /obj/item/food/organ))
to_chat(user, "<span class='warning'>[tool] was bitten by someone! It's too damaged to use!</span>")
return SURGERY_BEGINSTEP_SKIP