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

Merge pull request #631 from Erthilo/master

Browse Source 
Hypospray can now fit on medical belt. Fixed torso bugs. Fixed custom item derp. Small typo fixing.
This commit is contained in:
SkyMarshal
2012-03-07 16:38:52 -08:00
parent 7bc39b8733 55d316ee9d
commit 8e96007b35
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian_chaplain.dm
+1 -1
View File
@@ -20,7 +20,7 @@
H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
spawn(0)
var/religion_name = "Christianity"
var/new_religion = input(H, "You are the Chaplain / Councelor. For game mechanics purposes, you need to choose a religion either way. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)
var/new_religion = input(H, "You are the Chaplain / Counselor. For game mechanics purposes, you need to choose a religion either way. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)
if ((length(new_religion) == 0) || (new_religion == "Christianity"))
new_religion = religion_name
code/game/objects/storage/belt.dm
+1
View File
@@ -101,6 +101,7 @@
"/obj/item/weapon/reagent_containers/pill",
"/obj/item/weapon/reagent_containers/syringe",
"/obj/item/weapon/reagent_containers/glass/dispenser",
"/obj/item/weapon/reagent_containers/hypospray",
"/obj/item/weapon/zippo",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/storage/pill_bottle",
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1295,8 +1295,8 @@
else if (gender == FEMALE)
g = "f"
stand_icon = new /icon('human.dmi', "torso_s")
lying_icon = new /icon('human.dmi', "torso_l")
stand_icon = new /icon('human.dmi', "torso_[g]_s")
lying_icon = new /icon('human.dmi', "torso_[g]_l")
var/husk = (mutations & HUSK)
var/obese = (mutations & FAT)