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

codebase improvements (#346)

Browse Source 
* span procs

* spaces

* armor defines
This commit is contained in:
John Willard
2021-09-15 13:08:23 -04:00
committed by GitHub
parent 4a644d7bdb
commit 4aed9d573b
30 changed files with 228 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fulp_modules/main_features/beefmen/code/modules/__DEFINES/beefman_defines.dm
View File

@@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(color_list_beefman, list("Very Rare" = "d93356", "Rare" = "da2e
/// Taken from _HELPERS/mobs.dm, and assigned in global_lists.dm! (This is where we assign sprite_accessories(.dm) to the list, by name)
GLOBAL_LIST_INIT(eyes_beefman, list("Capers", "Cloves", "Olives", "Peppercorns"))
GLOBAL_LIST_INIT(mouths_beefman, list("Frown1", "Frown2", "Grit1", "Grit2", "Smile1", "Smile2"))
GLOBAL_LIST_INIT(mouths_beefman, list("Frown1", "Frown2", "Grit1", "Grit2", "Smile1", "Smile2"))
// PROSTHETICS //

33
fulp_modules/main_features/beefmen/code/modules/mob/beefman.dm
View File

@@ -18,9 +18,11 @@
TRAIT_EASYDISMEMBER,
TRAIT_SLEEPIMMUNE,
)
offset_features = list(OFFSET_UNIFORM = list(0,2), OFFSET_ID = list(0,2), OFFSET_GLOVES = list(0,-4), OFFSET_GLASSES = list(0,3), OFFSET_EARS = list(0,3), OFFSET_SHOES = list(0,0), \
OFFSET_S_STORE = list(0,2), OFFSET_FACEMASK = list(0,3), OFFSET_HEAD = list(0,3), OFFSET_FACE = list(0,3), OFFSET_BELT = list(0,3), OFFSET_BACK = list(0,2), \
OFFSET_SUIT = list(0,2), OFFSET_NECK = list(0,3))
offset_features = list(
OFFSET_UNIFORM = list(0,2), OFFSET_ID = list(0,2), OFFSET_GLOVES = list(0,-4), OFFSET_GLASSES = list(0,3), OFFSET_EARS = list(0,3), OFFSET_SHOES = list(0,0), \
OFFSET_S_STORE = list(0,2), OFFSET_FACEMASK = list(0,3), OFFSET_HEAD = list(0,3), OFFSET_FACE = list(0,3), OFFSET_BELT = list(0,3), OFFSET_BACK = list(0,2), \
OFFSET_SUIT = list(0,2), OFFSET_NECK = list(0,3),
)
skinned_type = /obj/item/food/meatball // NO SKIN // /obj/item/stack/sheet/animalhide/human
meat = /obj/item/food/meat/slab //What the species drops on gibbing
@@ -357,11 +359,17 @@
return FALSE
// Pry it off...
user.visible_message("[user] grabs onto [p_their()] own [affecting.name] and pulls.", span_notice("You grab hold of your [affecting.name] and yank hard."))
user.visible_message(
span_notice("[user] grabs onto [p_their()] own [affecting.name] and pulls."),
span_notice("You grab hold of your [affecting.name] and yank hard."),
)
if (!do_mob(user,target))
return TRUE
user.visible_message("[user]'s [affecting.name] comes right off in their hand.", span_notice("Your [affecting.name] pops right off."))
user.visible_message(
span_notice("[user]'s [affecting.name] comes right off in their hand."),
span_notice("Your [affecting.name] pops right off."),
)
playsound(get_turf(user), 'fulp_modules/main_features/beefmen/sounds/beef_hit.ogg', 40, 1)
// Destroy Limb, Drop Meat, Pick Up
@@ -393,16 +401,25 @@
if((target_zone in limbs))
if(user == H)
user.visible_message("[user] begins mashing [I] into [H]'s torso.", span_notice("You begin mashing [I] into your torso."))
user.visible_message(
span_notice("[user] begins mashing [I] into [H]'s torso."),
span_notice("You begin mashing [I] into your torso."),
)
else
user.visible_message("[user] begins mashing [I] into [H]'s torso.", span_notice("You begin mashing [I] into [H]'s torso."))
user.visible_message(
span_notice("[user] begins mashing [I] into [H]'s torso."),
span_notice("You begin mashing [I] into [H]'s torso."),
)
// Leave Melee Chain (so deleting the meat doesn't throw an error) <--- aka, deleting the meat that called this very proc.
spawn(1)
if(do_mob(user,H))
// Attach the part!
var/obj/item/bodypart/newBP = H.newBodyPart(target_zone, FALSE)
H.visible_message("The meat sprouts digits and becomes [H]'s new [newBP.name]!", span_notice("The meat sprouts digits and becomes your new [newBP.name]!"))
H.visible_message(
span_notice("The meat sprouts digits and becomes [H]'s new [newBP.name]!"),
span_notice("The meat sprouts digits and becomes your new [newBP.name]!"),
)
newBP.attach_limb(H)
newBP.give_meat(H, I)
playsound(get_turf(H), 'fulp_modules/main_features/beefmen/sounds/beef_grab.ogg', 50, 1)