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

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source
This commit is contained in:
Ren Erthilo
2012-04-28 17:24:38 +01:00
parent f194067b20 c290fbdd5a
commit e9dd09f298
13 changed files with 131 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+22 -10
View File
@@ -1098,7 +1098,8 @@
else
m_select.screen_loc = null
var/suit_img //A bit of kludge to make belts go under coats, but on other suits
var/suit_stain
if (wear_suit)
/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
src << "\red You burst out of the [wear_suit.name]!"
@@ -1112,7 +1113,7 @@
c:layer = initial(c:layer)*/
if (istype(wear_suit, /obj/item/clothing/suit))
var/t1 = wear_suit.icon_state
overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
suit_img = image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
if (wear_suit)
if (wear_suit.blood_DNA)
var/icon/stain_icon = null
@@ -1122,7 +1123,7 @@
stain_icon = icon('blood.dmi', "coatblood[!lying ? "" : "2"]")
else
stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
suit_stain = image("icon" = stain_icon, "layer" = MOB_LAYER)
wear_suit.screen_loc = ui_oclothing
if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
if (handcuffed)
@@ -1136,6 +1137,24 @@
hand = 0
drop_item()
hand = h
// Belt
var/belt_img //A bit of kludge to make belts go under coats, but on other suits
if (belt)
var/t1 = belt.item_state
if (!t1)
t1 = belt.icon_state
belt_img = image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
belt.screen_loc = ui_belt
//A bit of kludge to make belts go under coats, but on other suits
if (istype(wear_suit, /obj/item/clothing/suit/storage/det_suit) || istype(wear_suit, /obj/item/clothing/suit/storage/labcoat))
overlays += belt_img
overlays += suit_img
overlays += suit_stain
else
overlays += suit_img
overlays += suit_stain
overlays += belt_img
if (lying)
@@ -1169,13 +1188,6 @@
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
head.screen_loc = ui_head
// Belt
if (belt)
var/t1 = belt.item_state
if (!t1)
t1 = belt.icon_state
overlays += image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
belt.screen_loc = ui_belt
if ((wear_mask && !(wear_mask.see_face)) || (head && !(head.see_face))) // can't see the face
if (wear_id)
code/modules/mob/new_player/preferences.dm
+1 -1
View File
@@ -172,7 +172,7 @@ datum/preferences
switch(points)
if(0)
return "Unconfigured"
if(1 to 2)
if(1 to 3)
return "Terrifying"
if(4 to 6)
return "Below Average"
code/modules/mob/new_player/skill.dm
+1 -1
View File
@@ -177,7 +177,7 @@ mob/living/carbon/human/proc/GetSkillClass(points)
switch(points)
if(0)
return "Unconfigured"
if(1 to 2)
if(1 to 3)
return "Terrifying"
if(4 to 6)
return "Below Average"
code/modules/power/cable.dm
+1 -1
View File
@@ -221,7 +221,7 @@
/obj/item/weapon/cable_coil/proc/updateicon()
if (!color)
color = pick("red", "yellow", "blue", "green")
color = pick("red", "yellow", "blue", "green", "pink")
if(amount == 1)
icon_state = "coil_[color]1"
name = "cable piece"
code/modules/power/port_gen.dm
+2 -2
View File
@@ -297,7 +297,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/super
name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator"
icon_state = "portgen1"
sheet_path = "/obj/item/stack/sheet/uranium"
sheet_path = /obj/item/stack/sheet/uranium
power_gen = 15000
time_per_sheet = 25
board_path = "/obj/item/weapon/circuitboard/pacman/super"
@@ -307,7 +307,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/mrs
name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
icon_state = "portgen2"
sheet_path = "/obj/item/stack/sheet/diamond"
sheet_path = /obj/item/stack/sheet/diamond
power_gen = 40000
time_per_sheet = 30
board_path = "/obj/item/weapon/circuitboard/pacman/mrs"