mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
[Manual Mirror Fix] Removes shitty "status" variable on organs, makes them use organ_flag (#22480)
* Removes shitty "status" variable on organs, makes them use organ_flags instead (#76350) Title. Seriously this shit pisses me off, why are ORGAN_SYNTHETIC and ORGAN_ROBOTIC two different things? not applicable unless i fucked up --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> * Modulars * Some merge skew * More diffs --------- Co-authored-by: ChungusGamer666 <82850673+ChungusGamer666@users.noreply.github.com> Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> Co-authored-by: Giz <vinylspiders@gmail.com>
This commit is contained in:
co-authored by
Time-Green
ChungusGamer666
Giz
parent
170edfa122
commit
bb3d041572
@@ -42,7 +42,7 @@
|
||||
visual = FALSE
|
||||
item_flags = NOBLUDGEON
|
||||
slot = ORGAN_SLOT_MONSTER_CORE
|
||||
organ_flags = NONE
|
||||
organ_flags = ORGAN_ORGANIC
|
||||
force = 0
|
||||
/// Set to true if this organ has decayed into uselessness.
|
||||
var/inert = FALSE
|
||||
|
||||
@@ -898,8 +898,7 @@
|
||||
desc = "An eerie metal shard surrounded by dark energies...of soup drinking. You probably don't think you should have been able to find this."
|
||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||
icon_state = "cursed_katana_organ"
|
||||
status = ORGAN_ORGANIC
|
||||
organ_flags = ORGAN_FROZEN|ORGAN_UNREMOVABLE
|
||||
organ_flags = ORGAN_ORGANIC | ORGAN_FROZEN | ORGAN_UNREMOVABLE
|
||||
items_to_create = list(/obj/item/kitchen/spoon)
|
||||
extend_sound = 'sound/items/unsheath.ogg'
|
||||
retract_sound = 'sound/items/sheath.ogg'
|
||||
|
||||
Reference in New Issue
Block a user