cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 02:56:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7385 from Zuhayr/dev-freeze

Browse Source 
Reverts colours and catwalks.
This commit is contained in:
Zuhayr
2014-12-13 12:25:13 +10:30
parent 45edc7e4bc 9daa93a851
commit cd096fd45b
8 changed files with 158 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor_types.dm
+1 -16
View File
@@ -12,13 +12,6 @@
/turf/simulated/floor/airless/ceiling
icon_state = "rockvault"
/turf/simulated/floor/airless/catwalk
name = "catwalk"
icon = 'icons/turf/catwalks.dmi'
icon_state = "catwalk0"
floor_type = null
intact = 0
/turf/simulated/floor/light
name = "Light floor"
luminosity = 5
@@ -33,8 +26,6 @@
update_icon()
name = n
/turf/simulated/floor/wood
name = "floor"
icon_state = "wood"
@@ -225,10 +216,4 @@
icon_state = "snow"
/turf/simulated/floor/plating/snow/ex_act(severity)
return
/turf/simulated/floor/plating/airless/catwalk
icon = 'icons/turf/catwalks.dmi'
icon_state = "Floor3"
name = "catwalk"
desc = "Cats really don't like these things."
return
code/modules/clothing/spacesuits/rig/rig.dm
+4 -2
View File
@@ -595,6 +595,8 @@
H << "<font color='blue'><b>Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.</b></font>"
use_obj.canremove = 1
holder.drop_from_inventory(use_obj)
use_obj.loc = get_turf(src)
use_obj.dropped()
use_obj.canremove = 0
use_obj.loc = src
@@ -648,10 +650,10 @@
for(var/piece in list("helmet","gauntlets","chest","boots"))
toggle_piece(piece, H, ONLY_DEPLOY)
/obj/item/weapon/rig/dropped()
/obj/item/weapon/rig/dropped(var/mob/user)
..()
for(var/piece in list("helmet","gauntlets","chest","boots"))
toggle_piece(piece, wearer, ONLY_RETRACT)
toggle_piece(piece, user, ONLY_RETRACT)
wearer = null
//Todo
code/modules/clothing/spacesuits/spacesuits.dm
+5 -7
View File
@@ -70,27 +70,25 @@
check_limb_support()
..()
/obj/item/clothing/suit/space/dropped()
check_limb_support()
/obj/item/clothing/suit/space/dropped(var/mob/user)
check_limb_support(user)
..()
// Some space suits are equipped with reactive membranes that support
// broken limbs - at the time of writing, only the ninja suit, but
// I can see it being useful for other suits as we expand them. ~ Z
// The actual splinting occurs in /datum/organ/external/proc/fracture()
/obj/item/clothing/suit/space/proc/check_limb_support()
/obj/item/clothing/suit/space/proc/check_limb_support(var/mob/living/carbon/human/user)
// If this isn't set, then we don't need to care.
if(!supporting_limbs || !supporting_limbs.len)
return
var/mob/living/carbon/human/H = src.loc
// If the holder isn't human, or the holder IS and is wearing the suit, it keeps supporting the limbs.
if(!istype(H) || H.wear_suit == src)
if(!istype(user) || user.wear_suit == src)
return
// Otherwise, remove the splints.
for(var/datum/organ/external/E in supporting_limbs)
E.status &= ~ ORGAN_SPLINTED
user << "The suit stops supporting your [E.display_name]."
supporting_limbs = list()
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -167,7 +167,7 @@
src.sight &= ~SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 8
src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
src.see_invisible = SEE_INVISIBLE_MINIMUM
regular_hud_updates()
code/stylesheet.dm
+26 -40
View File
@@ -1,29 +1,29 @@
client/script = {"<style>
body {font-family: Verdana, sans-serif;}
h1, h2, h3, h4, h5, h6 {color: #0000ff; font-family: Georgia, Verdana, sans-serif;}
h1, h2, h3, h4, h5, h6 {color: #0000ff;font-family: Georgia, Verdana, sans-serif;}
em {font-style: normal; font-weight: bold;}
em {font-style: normal;font-weight: bold;}
.motd {color: #638500; font-family: Verdana, sans-serif;}
.motd {color: #638500;font-family: Verdana, sans-serif;}
.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6
{color: #638500; text-decoration: underline;}
{color: #638500;text-decoration: underline;}
.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover
{color: #638500;}
.prefix { font-weight: bold;}
.prefix {font-weight: bold;}
.log_message {color: #789FC7;}
/* OOC */
.ooc { font-weight: bold;}
.ooc {font-weight: bold;}
.ooc img.text_tag {width: 32px; height: 10px;}
.ooc .everyone {color: #1339ac;}
.ooc .looc {color: #46b2b2;}
.ooc .elevated {color: #386aff;}
.ooc .moderator {color: #386aff;}
.ooc .developer {color: #719300;}
.ooc .admin {color: #e40045;}
.ooc .everyone {color: #002eb8;}
.ooc .looc {color: #6699cc;}
.ooc .elevated {color: #2e78d9;}
.ooc .moderator {color: #184880;}
.ooc .developer {color: #1b521f;}
.ooc .admin {color: #b82e00;}
/* Admin: Private Messages */
.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;}
@@ -34,48 +34,34 @@ em {font-style: normal; font-weight: bold;}
/* Admin: Channels */
.mod_channel {color: #735638; font-weight: bold;}
.mod_channel .admin {color: #e40045; font-weight: bold;}
.admin_channel {color: #9611D4; font-weight: bold;}
.admin_channel {color: #402A14; font-weight: bold;}
/* Radio: Misc */
.deadsay {color: #530FAD;}
.radio {color: #008000;}
.deptradio {color: #ff00ff;} /* when all other department colors fail */
.newscaster {color: #750000;}
/* Radio Channels */
/*.radio {color: #42cc3d;} We will use the other color for everything, as this is unnecessarily bright */
.comradio {color: #5692C7;}
.airadio {color: #CA3584;}
.syndradio {color: #C7A556;}
.centradio {color: #3434EF;}
.comradio {color: #193A7A;}
.syndradio {color: #6D3F40;}
.centradio {color: #5C5C8A;}
.airadio {color: #FF00FF;}
.secradio {color: #EA1E1E;}
.engradio {color: #FA7136;}
.supradio {color: #B6703D;}
.medradio {color: #46C17A;}
.sciradio {color: #ad66cc;}
/*.srvradio {color: #b4cc66;} just like .radio */
/* Radio Channels: Message Only */
.radio {color: #247D22;}
.comradio .message {color: #2D5B86;}
.airadio .message {color: #9F2B68;}
.syndradio .message {color: #967832;}
.centradio .message {color: #1313E6;}
.secradio .message {color: #CB1212;}
.engradio .message {color: #F9540D;}
.supradio .message {color: #965C32;}
.medradio .message {color: #32965C;}
.sciradio .message {color: #923DB6;}
.srvradio {color: #8DA637;}
.secradio {color: #A30000;}
.engradio {color: #A66300;}
.medradio {color: #008160;}
.sciradio {color: #993399;}
.supradio {color: #5F4519;}
.srvradio {color: #6eaa2c;}
/* Miscellaneous */
.name { font-weight: bold;}
.name {font-weight: bold;}
.say {}
.alert {color: #ff0000;}
h1.alert, h2.alert {color: #000000;}
.emote { font-style: italic;}
.emote {font-style: italic;}
.attack {color: #ff0000;}
.moderate {color: #CC0000;}