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

Adds species-specific butts and fixes a few bugs

Browse Source
This commit is contained in:
ZomgPonies
2015-11-18 10:16:26 -05:00
parent 7b2060d91a
commit 3756d5457e
8 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/shadow.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/datum/species/shadow
name = "Shadow"
name_plural = "Shadows"
icobase = 'icons/mob/human_races/r_shadow.dmi'
deform = 'icons/mob/human_races/r_shadow.dmi'
@@ -12,7 +12,7 @@
blood_color = "#CCCCCC"
flesh_color = "#AAAAAA"
butt = "plasma"
has_organ = list(
"brain" = /obj/item/organ/brain
)
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -78,7 +78,7 @@
//Used in icon caching.
var/race_key = 0
var/icon/icon_template
var/butt = "human"//Determines which image to use for copier
var/is_small
var/show_ssd = 1
var/virus_immune
code/modules/mob/living/carbon/human/species/station.dm
+10 -9
View File
@@ -53,7 +53,7 @@
heat_level_3_breathe = 1100 //Default 1000
flesh_color = "#34AF10"
butt = "unathi"
reagent_tag = PROCESS_ORG
base_color = "#066000"
@@ -98,7 +98,7 @@
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
dietflags = DIET_OMNI
butt = "tajaran"
reagent_tag = PROCESS_ORG
flesh_color = "#AFA59E"
base_color = "#333333"
@@ -134,7 +134,7 @@
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
dietflags = DIET_OMNI
butt = "vulp"
reagent_tag = PROCESS_ORG
flesh_color = "#966464"
base_color = "#BE8264"
@@ -163,7 +163,7 @@
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR
dietflags = DIET_HERB
butt = "skrell"
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
reagent_tag = PROCESS_ORG
@@ -179,7 +179,7 @@
language = "Vox-pidgin"
speech_sounds = list('sound/voice/shriek1.ogg')
speech_chance = 20
butt = "vox"
unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too.
blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \
@@ -309,7 +309,7 @@
clothing_flags = HAS_SOCKS
bodyflags = FEET_CLAWS
dietflags = DIET_HERB
butt = "kidan"
blood_color = "#FB9800"
reagent_tag = PROCESS_ORG
@@ -328,7 +328,7 @@
bodyflags = HAS_SKIN_COLOR
bloodflags = BLOOD_SLIME
dietflags = DIET_CARN
butt = "slime"
reagent_tag = PROCESS_ORG
//ventcrawler = 1 //ventcrawling commented out
@@ -355,7 +355,7 @@
flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
dietflags = DIET_HERB
butt = "grey"
reagent_tag = PROCESS_ORG
blood_color = "#A200FF"
@@ -408,7 +408,7 @@
dietflags = 0 //Diona regenerate nutrition in light, no diet necessary
body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not
butt = "diona"
blood_color = "#004400"
flesh_color = "#907E4A"
@@ -503,6 +503,7 @@
clothing_flags = HAS_SOCKS
bodyflags = HAS_SKIN_COLOR
dietflags = 0 //IPCs can't eat, so no diet
butt = "machine"
blood_color = "#1F181F"
flesh_color = "#AAAAAA"
virus_immune = 1
code/modules/paperwork/photocopier.dm
+12 -11
View File
@@ -13,7 +13,7 @@
var/copies = 1 //how many copies to print!
var/toner = 30 //how much toner is left! woooooo~
var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
var/mob/living/carbon/ass = null
var/mob/living/ass = null
/obj/machinery/photocopier/attack_ai(mob/user as mob)
return attack_hand(user)
@@ -228,15 +228,16 @@
usr << "<span class='notice'>You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>"
return
if(check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
temp_img = icon("icons/ass/assalien.png")
else if(ishuman(ass)) //Suit checks are in check_ass
if(ass.gender == MALE)
temp_img = icon("icons/ass/assmale.png")
else if(ass.gender == FEMALE)
temp_img = icon("icons/ass/assfemale.png")
else //In case anyone ever makes the generic ass. For now I'll be using male asses.
temp_img = icon("icons/ass/assmale.png")
if(ishuman(ass)) //Suit checks are in check_ass
var/mob/living/carbon/human/H = ass
temp_img = icon('icons/obj/butts.dmi', "[H.species.butt]")
else if(istype(ass,/mob/living/silicon/robot/drone))
temp_img = icon('icons/obj/butts.dmi', "drone")
else if(istype(ass,/mob/living/simple_animal/diona))
temp_img = icon('icons/obj/butts.dmi', "nymph")
else if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
temp_img = icon('icons/obj/butts.dmi', "xeno")
else return
else
return
var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc)
@@ -285,7 +286,7 @@
if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
return
src.add_fingerprint(user)
if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
if(target == user && !user.incapacitated())
visible_message("<span class='warning'>[usr] jumps onto the photocopier!</span>")
else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
if(target.anchored) return