cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some things (#2886)

Browse Source 
Fixes #2832
Fixes #2821
Fixes #2805
Adds a tint to the bomb suit helmet
Fixes the wizard voidsuit an outdated wizard faction check
Fixes pants don't convering the legs
Fixes hailers showing their messages on the lobby
Reduces the recharge cost of the mounted thermal drill, so, it won't use an entire powercell when you fire it once
This commit is contained in:
Alberyk
2017-07-01 15:53:49 -03:00
committed by skull132
parent 42f91d8117
commit 1365befb04
8 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+5 -4
View File
@@ -147,7 +147,7 @@
/datum/gear/uniform/pants
display_name = "pants selection"
path = /obj/item/clothing/under/pants
/datum/gear/uniform/pants/New()
..()
var/pants = list()
@@ -162,9 +162,10 @@
pants["tan pants"] = /obj/item/clothing/under/pants/tan
pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
pants["track pants"] = /obj/item/clothing/under/pants/track
pants["camo pants"] = /obj/item/clothing/under/pants/camo
gear_tweaks += new/datum/gear_tweak/path(pants)
/datum/gear/uniform/turtleneck
display_name = "tacticool turtleneck"
display_name = "tacticool turtleneck"
path = /obj/item/clothing/under/syndicate/tacticool
code/modules/clothing/spacesuits/void/wizard.dm
+30 -30
View File
@@ -13,22 +13,22 @@
wizard_garb = 1
species_restricted = list("Human", "Machine", "Skeleton")
equipped(var/mob/user)
if(!(user.faction == "Space Wizard"))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/LH = H.get_organ("l_hand")
var/obj/item/organ/external/RH = H.get_organ("r_hand")
var/active_hand = H.hand
user << "<span class='warning'>Your hand passes through the [src] with a flash of searing heat!</span>"
playsound(user, 'sound/effects/sparks4.ogg', 40, 1)
user.drop_item()
if(active_hand)
LH.droplimb(0,DROPLIMB_BURN)
else
RH.droplimb(0,DROPLIMB_BURN)
return
/obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/LH = H.get_organ("l_hand")
var/obj/item/organ/external/RH = H.get_organ("r_hand")
var/active_hand = H.hand
user << "<span class='warning'>Your hand passes through the [src] with a flash of searing heat!</span>"
playsound(user, 'sound/effects/sparks4.ogg', 40, 1)
user.drop_item()
if(active_hand)
LH.droplimb(0,DROPLIMB_BURN)
else
..()
RH.droplimb(0,DROPLIMB_BURN)
return
else
..()
/obj/item/clothing/suit/space/void/wizard
@@ -49,20 +49,20 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
species_restricted = list("Human", "Skrell", "Machine", "Skeleton")
equipped(var/mob/user)
if(!(user.faction == "Space Wizard"))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/LH = H.get_organ("l_hand")
var/obj/item/organ/external/RH = H.get_organ("r_hand")
var/active_hand = H.hand
user << "<span class='warning'>Your hand passes through the [src] with a flash of searing heat!</span>"
playsound(user, 'sound/effects/sparks4.ogg', 40, 1)
user.drop_item()
if(active_hand)
LH.droplimb(0,DROPLIMB_BURN)
else
RH.droplimb(0,DROPLIMB_BURN)
return
/obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/LH = H.get_organ("l_hand")
var/obj/item/organ/external/RH = H.get_organ("r_hand")
var/active_hand = H.hand
user << "<span class='warning'>Your hand passes through the [src] with a flash of searing heat!</span>"
playsound(user, 'sound/effects/sparks4.ogg', 40, 1)
user.drop_item()
if(active_hand)
LH.droplimb(0,DROPLIMB_BURN)
else
..()
RH.droplimb(0,DROPLIMB_BURN)
return
else
..()
code/modules/clothing/suits/utility.dm
+1 -1
View File
@@ -59,7 +59,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0
tint = TINT_HEAVY
//Changes by Nanako
code/modules/clothing/under/shorts.dm
+10 -10
View File
@@ -39,7 +39,7 @@
item_state = "jeans"
contained_sprite = 1
gender = PLURAL
body_parts_covered = LOWER_TORSO
body_parts_covered = LOWER_TORSO|LEGS
/obj/item/clothing/under/pants/track
name = "track pants"
@@ -48,7 +48,7 @@
icon_state = "trackpants"
item_state = "trackpants"
contained_sprite = 1
/obj/item/clothing/under/pants/classic
name = "classic jeans"
desc = "A pair of classic jeans."
@@ -60,49 +60,49 @@
desc = "Made in the finest space jeans factory this side of Tau Ceti."
icon_state = "jeansmustang"
item_state = "jeansmustang"
/obj/item/clothing/under/pants/jeansblack
name = "black jeans"
desc = "A pair of black jeans."
icon_state = "jeansblack"
item_state = "jeansblack"
/obj/item/clothing/under/pants/youngfolksjeans
name = "young folks jeans"
desc = "For those tired of boring old jeans."
icon_state = "jeansyoungfolks"
item_state = "jeansyoungfolks"
/obj/item/clothing/under/pants/white
name = "white pants"
desc = "Plain boring white pants."
icon_state = "whitepants"
item_state = "whitepants"
/obj/item/clothing/under/pants/black
name = "black pants"
desc = "A pair of plain black pants."
icon_state = "blackpants"
item_state = "blackpants"
/obj/item/clothing/under/pants/red
name = "red pants"
desc = "Bright red pants."
icon_state = "redpants"
item_state = "redpants"
/obj/item/clothing/under/pants/tan
name = "tan pants"
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
item_state = "tanpants"
/obj/item/clothing/under/pants/khaki
name = "tan pants"
desc = "A pair of dust beige khaki pants."
icon_state = "khaki"
item_state = "khaki"
/obj/item/clothing/under/pants/camo
name = "camouflage pants"
desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
code/modules/mining/mine_items.dm
+3 -2
View File
@@ -1237,8 +1237,9 @@ var/list/total_extraction_beacons = list()
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
/obj/structure/punching_bag/attack_hand(mob/user as mob)
flick("[icon_state]2", src)
playsound(src.loc, pick(src.hit_sounds), 25, 1, -1)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
flick("[icon_state]2", src)
playsound(src.loc, pick(src.hit_sounds), 25, 1, -1)
/obj/structure/weightlifter
name = "Weight Machine"
code/modules/mob/new_player/new_player.dm
+3
View File
@@ -498,3 +498,6 @@
/mob/new_player/MayRespawn()
return 1
/mob/new_player/show_message(msg, type, alt, alt_type)
return
code/modules/projectiles/guns/energy/mining.dm
+1 -1
View File
@@ -26,7 +26,7 @@
playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
user.visible_message(
"<span class='warning'>\The [user] pumps \the [src]!</span>",
"<span class='warning'>You pump \the [src]]!</span>"
"<span class='warning'>You pump \the [src]!</span>"
)
power_supply.charge = power_supply.maxcharge
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -472,7 +472,7 @@
recharge_time = 1
charge_meter = 1
use_external_power = 1
charge_cost = 200
charge_cost = 25
/obj/item/weapon/gun/energy/vaurca/mountedthermaldrill/special_check(var/mob/user)
..()