shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thalpy
2019-08-05 09:09:36 +01:00
committed by GitHub
parent ffa717e8d7 96dd255fe0
commit 5795f6bbe2
250 changed files with 5984 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/chair.dm
+64 -4
View File
@@ -317,9 +317,6 @@
new stack_type(get_turf(loc))
qdel(src)
/obj/item/chair/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == UNARMED_ATTACK && prob(hit_reaction_chance))
owner.visible_message("<span class='danger'>[owner] fends off [attack_text] with [src]!</span>")
@@ -338,7 +335,6 @@
C.Knockdown(20)
smash(user)
/obj/item/chair/stool
name = "stool"
icon_state = "stool_toppled"
@@ -352,6 +348,70 @@
item_state = "stool_bar"
origin_type = /obj/structure/chair/stool/bar
//////////////////////////
//Brass & Bronze stools!//
//////////////////////////
/obj/structure/chair/stool/bar/brass
name = "brass bar stool"
desc = "A brass bar stool with red silk for a pillow."
icon_state = "barbrass"
item_chair = /obj/item/chair/stool/bar/brass
buildstacktype = /obj/item/stack/tile/brass
buildstackamount = 1
/obj/structure/chair/stool/bar/bronze
name = "bronze bar stool"
desc = "A bronze bar stool with red silk for a pillow."
icon_state = "barbrass"
item_chair = /obj/item/chair/stool/bar/bronze
buildstacktype = /obj/item/stack/tile/bronze
buildstackamount = 1
/obj/structure/chair/stool/brass
name = "brass stool"
desc = "A brass stool with a silk top for comfort."
icon_state = "stoolbrass"
item_chair = /obj/item/chair/stool/brass
buildstacktype = /obj/item/stack/tile/brass
buildstackamount = 1
/obj/structure/chair/stool/bronze
name = "bronze stool"
desc = "A bronze stool with a silk top for comfort."
icon_state = "stoolbrass"
item_chair = /obj/item/chair/stool/bronze
buildstacktype = /obj/item/stack/tile/bronze
buildstackamount = 1
/obj/item/chair/stool/brass
name = "brass stool"
icon_state = "stoolbrass_toppled"
item_state = "stoolbrass"
origin_type = /obj/structure/chair/stool/brass
/obj/item/chair/stool/bar/brass
name = "brass bar stool"
icon_state = "barbrass_toppled"
item_state = "stoolbrass_bar"
origin_type = /obj/structure/chair/stool/bar/brass
/obj/item/chair/stool/bronze
name = "bronze stool"
icon_state = "stoolbrass_toppled"
item_state = "stoolbrass"
origin_type = /obj/structure/chair/stool/bronze
/obj/item/chair/stool/bar/bronze
name = "bronze bar stool"
icon_state = "barbrass_toppled"
item_state = "stoolbrass_bar"
origin_type = /obj/structure/chair/stool/bar/bronze
/////////////////////////////////
//End of Brass & Bronze stools!//
/////////////////////////////////
/obj/item/chair/stool/narsie_act()
return //sturdy enough to ignore a god
code/game/objects/structures/crates_lockers/closets.dm
+607 -514
View File
File diff suppressed because it is too large Load Diff
code/game/objects/structures/crates_lockers/closets/bodybag.dm
+6
View File
@@ -49,6 +49,12 @@
return 1
return 0
/obj/structure/closet/body_bag/handle_lock_addition()
return
/obj/structure/closet/body_bag/handle_lock_removal()
return
/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
. = ..()
if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+5
View File
@@ -57,6 +57,11 @@
I.alpha = 0
animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
/obj/structure/closet/cardboard/handle_lock_addition() //Whoever heard of a lockable cardboard box anyway
return
/obj/structure/closet/cardboard/handle_lock_removal()
return
/obj/structure/closet/cardboard/metal
name = "large metal box"
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+5
View File
@@ -358,3 +358,8 @@
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/storage/backpack/satchel/explorer(src)
/obj/structure/closet/coffin/handle_lock_addition()
return
/obj/structure/closet/coffin/handle_lock_removal()
return
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+29 -17
View File
@@ -4,6 +4,18 @@
req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
var/registered_name = null
/obj/structure/closet/secure_closet/personal/examine(mob/user)
..()
if(registered_name)
to_chat(user, "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>")
/obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I)
. = ..()
if(!I || !istype(I))
return
if(registered_name == I.registered_name)
return TRUE
/obj/structure/closet/secure_closet/personal/PopulateContents()
..()
if(prob(50))
@@ -33,21 +45,21 @@
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/I = W.GetID()
if(istype(I))
if(broken)
to_chat(user, "<span class='danger'>It appears to be broken.</span>")
return
if(!I || !I.registered_name)
return
if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
//they can open all lockers, or nobody owns this, or they own this locker
locked = !locked
update_icon()
if(!registered_name)
registered_name = I.registered_name
desc = "Owned by [I.registered_name]."
else
to_chat(user, "<span class='danger'>Access Denied.</span>")
else
if(!I || !istype(I))
return ..()
if(!can_lock(user, FALSE)) //Can't do anything if there isn't a lock!
return
if(I.registered_name && !registered_name)
to_chat(user, "<span class='notice'>You claim [src].</span>")
registered_name = I.registered_name
else
..()
/obj/structure/closet/secure_closet/personal/handle_lock_addition() //If lock construction is successful we don't care what access the electronics had, so we override it
if(..())
req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
lockerelectronics.accesses = req_access
/obj/structure/closet/secure_closet/personal/handle_lock_removal()
if(..())
registered_name = null
code/game/objects/structures/crates_lockers/crates.dm
+6
View File
@@ -54,6 +54,12 @@
manifest = null
update_icon()
/obj/structure/closet/crate/handle_lock_addition()
return
/obj/structure/closet/crate/handle_lock_removal()
return
/obj/structure/closet/crate/proc/tear_manifest(mob/user)
to_chat(user, "<span class='notice'>You tear the manifest off of [src].</span>")
playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
code/game/objects/structures/dresser.dm
+1 -1
View File
@@ -79,4 +79,4 @@
var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return default_color
return n_color
return sanitize_hexcolor(n_color, include_crunch= TRUE)
code/game/objects/structures/femur_breaker.dm
+174
View File
@@ -0,0 +1,174 @@
#define BREAKER_ANIMATION_LENGTH 32
#define BREAKER_SLAT_RAISED 1
#define BREAKER_SLAT_MOVING 2
#define BREAKER_SLAT_DROPPED 3
#define BREAKER_ACTIVATE_DELAY 30
#define BREAKER_WRENCH_DELAY 10
#define BREAKER_ACTION_INUSE 5
#define BREAKER_ACTION_WRENCH 6
/obj/structure/femur_breaker
name = "femur breaker"
desc = "A large structure used to break the femurs of traitors and treasonists."
icon = 'icons/obj/femur_breaker.dmi'
icon_state = "breaker_raised"
can_buckle = TRUE
anchored = TRUE
density = TRUE
max_buckled_mobs = 1
buckle_lying = TRUE
buckle_prevents_pull = TRUE
layer = ABOVE_MOB_LAYER
var/slat_status = BREAKER_SLAT_RAISED
var/current_action = 0 // What's currently happening to the femur breaker
/obj/structure/femur_breaker/examine(mob/user)
..()
var/msg = ""
msg += "It is [anchored ? "secured to the floor." : "unsecured."]<br/>"
if (slat_status == BREAKER_SLAT_RAISED)
msg += "The breaker slat is in a neutral position."
else
msg += "The breaker slat is lowered, and must be raised."
if (LAZYLEN(buckled_mobs))
msg += "<br/>"
msg += "Someone appears to be strapped in. You can help them unbuckle, or activate the femur breaker."
to_chat(user, msg)
return msg
/obj/structure/femur_breaker/attack_hand(mob/user)
add_fingerprint(user)
// Currently being used
if (current_action)
return
switch (slat_status)
if (BREAKER_SLAT_MOVING)
return
if (BREAKER_SLAT_DROPPED)
slat_status = BREAKER_SLAT_MOVING
icon_state = "breaker_raise"
addtimer(CALLBACK(src, .proc/raise_slat), BREAKER_ANIMATION_LENGTH)
return
if (BREAKER_SLAT_RAISED)
if (LAZYLEN(buckled_mobs))
if (user.a_intent == INTENT_HARM)
user.visible_message("<span class='warning'>[user] begins to pull the lever!</span>",
"<span class='warning'>You begin to the pull the lever.</span>")
current_action = BREAKER_ACTION_INUSE
if (do_after(user, BREAKER_ACTIVATE_DELAY, target = src) && slat_status == BREAKER_SLAT_RAISED)
current_action = 0
slat_status = BREAKER_SLAT_MOVING
icon_state = "breaker_drop"
drop_slat(user)
else
current_action = 0
else
var/mob/living/carbon/human/H = buckled_mobs[1]
if (H)
H.regenerate_icons()
unbuckle_all_mobs()
else //HERE
slat_status = BREAKER_SLAT_DROPPED
icon_state = "breaker_drop"
/obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H)
H.say("AAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHH!!", forced = "femur broken")
H.apply_damage(150, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
/obj/structure/femur_breaker/proc/raise_slat()
slat_status = BREAKER_SLAT_RAISED
icon_state = "breaker_raised"
/obj/structure/femur_breaker/proc/drop_slat(mob/user)
if (buckled_mobs.len)
var/mob/living/carbon/human/H = buckled_mobs[1]
if (!H)
return
playsound(src, 'sound/effects/femur_breaker.ogg', 100, FALSE)
H.Stun(BREAKER_ANIMATION_LENGTH)
addtimer(CALLBACK(src, .proc/damage_leg, H), BREAKER_ANIMATION_LENGTH, TIMER_UNIQUE)
log_combat(user, H, "femur broke", src)
slat_status = BREAKER_SLAT_DROPPED
icon_state = "breaker"
/obj/structure/femur_breaker/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if (!anchored)
to_chat(usr, "<span class='warning'>The [src] needs to be wrenched to the floor!</span>")
return FALSE
if (!istype(M, /mob/living/carbon/human))
to_chat(usr, "<span class='warning'>It doesn't look like [M.p_they()] can fit into this properly!</span>")
return FALSE
if (slat_status != BREAKER_SLAT_RAISED)
to_chat(usr, "<span class='warning'>The femur breaker must be in its neutral position before buckling someone in!</span>")
return FALSE
return ..(M, force, FALSE)
/obj/structure/femur_breaker/post_buckle_mob(mob/living/M)
if (!istype(M, /mob/living/carbon/human))
return
var/mob/living/carbon/human/H = M
if (H.dna)
if (H.dna.species)
var/datum/species/S = H.dna.species
if (!istype(S))
unbuckle_all_mobs()
else
unbuckle_all_mobs()
else
unbuckle_all_mobs()
..()
/obj/structure/femur_breaker/can_be_unfasten_wrench(mob/user, silent)
if (LAZYLEN(buckled_mobs))
if (!silent)
to_chat(user, "<span class='warning'>Can't unfasten, someone's strapped in!</span>")
return FAILED_UNFASTEN
if (current_action)
return FAILED_UNFASTEN
return ..()
/obj/structure/femur_breaker/wrench_act(mob/living/user, obj/item/I)
if (current_action)
return
current_action = BREAKER_ACTION_WRENCH
if (do_after(user, BREAKER_WRENCH_DELAY, target = src))
current_action = 0
default_unfasten_wrench(user, I, 0)
setDir(SOUTH)
return TRUE
else
current_action = 0
#undef BREAKER_ANIMATION_LENGTH
#undef BREAKER_SLAT_RAISED
#undef BREAKER_SLAT_MOVING
#undef BREAKER_SLAT_DROPPED
#undef BREAKER_ACTIVATE_DELAY
#undef BREAKER_WRENCH_DELAY
#undef BREAKER_ACTION_INUSE
#undef BREAKER_ACTION_WRENCH