forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Brings the monkey back down (body horror edition/addition.) (tgstatio…
…n#73325) ## About The Pull Request Let me paint you a story. A long time ago monkeys once rested their feet on the floor, this was a time of bliss and peace. But sometime around the horrors of making monkeys subtypes of humans did an atrocity occur. ![image](https://user-images.githubusercontent.com/55666666/217657059-5c960ab4-c3de-493c-ac12-28de99b43d7f.png) **The monkeys were moved up.** I thought this was bad, and alot of people on the forum tended to agree with me ![image](https://user-images.githubusercontent.com/55666666/217657707-120354c7-b1a5-4d93-8813-8e10e142bd92.png) This was do to some purpose of adjusting them so it could be easier to fit item sprites onto them instead of preforming the hours of work refractoring to make the heights of the items dynamic and adjustable. A simple pixel shift may have sufficed, but you see, such a change would NEVER allow the frankensteining of monkey and human features together. This is that refractor. In essence, the following is now true. A top_offset can now be generated for a human based on a varible on their chest and legs. By default, and as is true with human legs and chests, this variable is ZERO by default. Monkey legs and chest have NEGATIVE values proportionate and onto how much smaller their sprite is compared to humans. Other bodyparts, as well as any other accociated overlays, or clothing will automatically be offset to this axis. THIS MEANS THAT MONKEYS ARE ON THE FLOOR. But is means something else too. Something more freakish, ![image](https://user-images.githubusercontent.com/55666666/217659439-bc0b1a35-76c8-4490-b869-770180605822.png) **What abominable monsters**, unreachable by players as long as we can't stitch monkeys and humans together (oh but just wait until the feature freeze ends) Oh but you might be thinking, if legs can make a mob go down. can it make a mob **go** **up??** **OH NO** ![image](https://user-images.githubusercontent.com/55666666/217707042-0d53022f-d93a-4262-a5ce-ef15a99eb897.png) ![image](https://user-images.githubusercontent.com/55666666/217707060-779f5901-ab90-4a64-9ca7-0b147e24f099.png) ![image](https://user-images.githubusercontent.com/55666666/217707821-23d7457c-5881-40ae-8d9d-c9fbd645aba6.png) These lads are stepping, and have been implemented solely for proof of concept as a way to flex the system I have created and remain inaccessible without admin intervention. But really, when all is said and done, all this PR does in terms of player facing changes is move the monkey back down. ![image](https://user-images.githubusercontent.com/55666666/217708365-b6922a6d-08d0-4267-8713-4f8dac29038e.png) Oh and fixed monkey husked which have been broken for who knows how long. ![image](https://user-images.githubusercontent.com/55666666/217708464-5a9b6f89-4223-4ae5-a21e-3a274a9f8db8.png) ## Why It's Good For The Game The monkey is restored to its original position. Tools now exist to have legs and torsos of varying heights. Monkey Husking is fixed. ## Changelog :cl: itseasytosee fix: Monkeys ues the proper husk sprites. imageadd: The monkey has been moved back down to its lower, more submissive position. refactor: Your bodyparts are now dynamically rendered at a height relevant to the length of your legs and torso, what does this mean for you? Not much to be honest, but you might see a monkey pop up a bit if you cut its legs off. admin: The Tallboy is here /:cl: --------- Co-authored-by: Fikou <[email protected]> Co-authored-by: san7890 <[email protected]>
- Loading branch information
1 parent
20ac6d5
commit 8ab7452
Showing
21 changed files
with
146 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
code/modules/mob/living/carbon/human/species_types/abominations.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/// These won't appear normally in games, they are meant to for debuging the adjustment of limbs based on the height of a humans bodyparts. | ||
/datum/species/human/tallboy | ||
name = "\improper Tall Boy" | ||
id = SPECIES_TALLBOY | ||
bodypart_overrides = list( | ||
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left, | ||
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right, | ||
BODY_ZONE_HEAD = /obj/item/bodypart/head, | ||
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/tallboy, | ||
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/tallboy, | ||
BODY_ZONE_CHEST = /obj/item/bodypart/chest, | ||
) | ||
|
||
/datum/species/monkey/human_legged | ||
id = SPECIES_MONKEY_HUMAN_LEGGED | ||
bodypart_overrides = list( | ||
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/monkey, | ||
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/monkey, | ||
BODY_ZONE_HEAD = /obj/item/bodypart/head/monkey, | ||
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left, | ||
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right, | ||
BODY_ZONE_CHEST = /obj/item/bodypart/chest/monkey, | ||
) | ||
|
||
/datum/species/monkey/monkey_freak | ||
id = SPECIES_MONKEY_FREAK | ||
bodypart_overrides = list( | ||
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left, | ||
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right, | ||
BODY_ZONE_HEAD = /obj/item/bodypart/head/monkey, | ||
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/monkey, | ||
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/monkey, | ||
BODY_ZONE_CHEST = /obj/item/bodypart/chest, | ||
) | ||
|
||
/mob/living/carbon/human/species/monkey/humand_legged | ||
race = /datum/species/monkey/human_legged | ||
|
||
/mob/living/carbon/human/species/monkey/monkey_freak | ||
race = /datum/species/monkey/monkey_freak | ||
|
||
/mob/living/carbon/human/species/tallboy | ||
race = /datum/species/human/tallboy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,3 +92,4 @@ | |
)) | ||
|
||
return to_add | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+457 Bytes
...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_tallboy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1 Byte
(100%)
code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+873 Bytes
...t_tests/screenshots/screenshot_humanoids__datum_species_monkey_human_legged.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+951 Bytes
...t_tests/screenshots/screenshot_humanoids__datum_species_monkey_monkey_freak.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters