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

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/alien_nest.dm
+16 -10
View File
@@ -5,8 +5,7 @@
desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
icon = 'icons/obj/smooth_structures/alien/nest.dmi'
icon_state = "nest"
obj_integrity = 120
max_integrity = 120
var/health = 100
smooth = SMOOTH_TRUE
can_be_unanchored = 0
canSmoothWith = null
@@ -82,15 +81,22 @@
M.layer = initial(M.layer)
overlays -= nest_overlay
/obj/structure/bed/nest/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
/obj/structure/bed/nest/attacked_by(obj/item/I, mob/user)
..()
take_damage(I.force, I.damtype)
/obj/structure/bed/nest/proc/take_damage(damage, damage_type = BRUTE, sound_effect = 1)
switch(damage_type)
if(BRUTE)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
if(sound_effect)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
if(BURN)
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
if(sound_effect)
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
else
return
health -= damage
if(health <=0)
density = 0
qdel(src)
/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user)
if(user.a_intent != INTENT_HARM)
return attack_hand(user)
else
return ..()
code/game/objects/structures/beds_chairs/bed.dm
+55 -60
View File
@@ -15,26 +15,41 @@
anchored = 1
can_buckle = 1
buckle_lying = 1
resistance_flags = FLAMMABLE
obj_integrity = 100
max_integrity = 100
integrity_failure = 30
burn_state = FLAMMABLE
burntime = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
/obj/structure/bed/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
if(buildstacktype)
new buildstacktype(loc,buildstackamount)
/obj/structure/bed/deconstruct()
if(buildstacktype)
new buildstacktype(loc,buildstackamount)
..()
/obj/structure/bed/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/bed/attack_animal(mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
deconstruct()
/obj/structure/bed/ex_act(severity, target)
switch(severity)
if(1)
qdel(src)
return
if(2)
if(prob(70))
deconstruct()
return
if(3)
if(prob(50))
deconstruct()
return
/obj/structure/bed/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT))
playsound(src.loc, W.usesound, 50, 1)
deconstruct(TRUE)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
deconstruct()
else
return ..()
@@ -46,43 +61,21 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
resistance_flags = 0
burn_state = FIRE_PROOF
var/foldabletype = /obj/item/roller
/obj/structure/bed/roller/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/roller/robo))
var/obj/item/roller/robo/R = W
if(R.loaded)
user << "<span class='warning'>You already have a roller bed docked!</span>"
return
if(has_buckled_mobs())
if(buckled_mobs.len > 1)
unbuckle_all_mobs()
user.visible_message("<span class='notice'>[user] unbuckles all creatures from [src].</span>")
else
user_unbuckle_mob(buckled_mobs[1],user)
else
R.loaded = src
forceMove(R)
user.visible_message("[user] collects [src].", "<span class='notice'>You collect [src].</span>")
return 1
else
return ..()
/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
. = ..()
if(over_object == usr && Adjacent(usr))
if(!ishuman(usr))
return 0
if(has_buckled_mobs())
if(buckled_mobs.len)
return 0
if(usr.incapacitated())
usr << "<span class='warning'>You can't do that right now!</span>"
return 0
usr.visible_message("[usr] collapses \the [src.name].", "<span class='notice'>You collapse \the [src.name].</span>")
var/obj/structure/bed/roller/B = new foldabletype(get_turf(src))
usr.put_in_hands(B)
new foldabletype(get_turf(src))
qdel(src)
/obj/structure/bed/roller/post_buckle_mob(mob/living/M)
@@ -102,31 +95,11 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
w_class = WEIGHT_CLASS_BULKY // Can't be put in backpacks.
w_class = 4 // Can't be put in backpacks.
/obj/item/roller/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/roller/robo))
var/obj/item/roller/robo/R = I
if(R.loaded)
user << "<span class='warning'>[R] already has a roller bed loaded!</span>"
return
user.visible_message("<span class='notice'>[user] loads [src].</span>", "<span class='notice'>You load [src] into [R].</span>")
R.loaded = new/obj/structure/bed/roller(R)
qdel(src) //"Load"
return
else return ..()
/obj/item/roller/attack_self(mob/user)
deploy_roller(user, user.loc)
/obj/item/roller/afterattack(obj/target, mob/user , proximity)
if(!proximity)
return
if(isopenturf(target))
deploy_roller(user, target)
/obj/item/roller/proc/deploy_roller(mob/user, atom/location)
var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(location)
var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
R.add_fingerprint(user)
qdel(src)
@@ -143,15 +116,37 @@
..()
user << "The dock is [loaded ? "loaded" : "empty"]"
/obj/item/roller/robo/deploy_roller(mob/user, atom/location)
/obj/item/roller/robo/attack_self(mob/user)
if(loaded)
var/obj/structure/bed/roller/R = loaded
R.loc = location
R.loc = user.loc
user.visible_message("[user] deploys [loaded].", "<span class='notice'>You deploy [loaded].</span>")
loaded = null
else
user << "<span class='warning'>The dock is empty!</span>"
/obj/item/roller/robo/afterattack(obj/target, mob/user , proximity)
if(istype(target,/obj/structure/bed/roller))
if(!proximity)
return
if(loaded)
user << "<span class='warning'>You already have a roller bed docked!</span>"
return
var/obj/structure/bed/roller/R = target
if(R.has_buckled_mobs())
if(R.buckled_mobs.len > 1)
R.unbuckle_all_mobs()
user.visible_message("<span class='notice'>[user] unbuckles all creatures from [R].</span>")
else
R.user_unbuckle_mob(R.buckled_mobs[1],user)
loaded = target
target.loc = src
user.visible_message("[user] collects [loaded].", "<span class='notice'>You collect [loaded].</span>")
..()
//Dog bed
/obj/structure/bed/dogbed
@@ -166,4 +161,4 @@
/obj/structure/bed/alien
name = "resting contraption"
desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
icon_state = "abed"
icon_state = "abed"
code/game/objects/structures/beds_chairs/chair.dm
+30 -16
View File
@@ -6,10 +6,7 @@
anchored = 1
can_buckle = 1
buckle_lying = 0 //you sit in a chair, not lay
resistance_flags = 0
obj_integrity = 250
max_integrity = 250
integrity_failure = 25
burn_state = FIRE_PROOF
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
@@ -27,6 +24,24 @@
/obj/structure/chair/attack_paw(mob/user)
return attack_hand(user)
/obj/structure/chair/attack_animal(mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
deconstruct()
/obj/structure/chair/ex_act(severity, target)
switch(severity)
if(1)
qdel(src)
return
if(2)
if(prob(70))
deconstruct()
return
if(3)
if(prob(50))
deconstruct()
return
/obj/structure/chair/narsie_act()
if(prob(20))
var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src))
@@ -35,7 +50,7 @@
/obj/structure/chair/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT))
playsound(src.loc, W.usesound, 50, 1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
deconstruct()
else if(istype(W, /obj/item/assembly/shock_kit))
if(!user.drop_item())
@@ -56,6 +71,7 @@
..()
else
rotate()
return
/obj/structure/chair/proc/handle_rotation(direction)
handle_layer()
@@ -106,9 +122,8 @@
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 20
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 3
item_chair = /obj/item/chair/wood
@@ -128,9 +143,8 @@
desc = "It looks comfy.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "comfychair"
color = rgb(255,255,255)
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 30
buildstackamount = 2
var/image/armrest = null
item_chair = null
@@ -138,6 +152,7 @@
/obj/structure/chair/comfy/New()
armrest = image("icons/obj/chairs.dmi", "comfychair_armrest")
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
@@ -189,7 +204,7 @@
/obj/structure/chair/MouseDrop(over_object, src_location, over_location)
. = ..()
if(over_object == usr && Adjacent(usr))
if(!item_chair || !usr.can_hold_items() || has_buckled_mobs() || src.flags & NODECONSTRUCT)
if(!item_chair || !ishuman(usr) || has_buckled_mobs() || src.flags & NODECONSTRUCT)
return
if(usr.incapacitated())
usr << "<span class='warning'>You can't do that right now!</span>"
@@ -211,7 +226,7 @@
icon = 'icons/obj/chairs.dmi'
icon_state = "chair_toppled"
item_state = "chair"
w_class = WEIGHT_CLASS_HUGE
w_class = 5
force = 8
throwforce = 10
throw_range = 3
@@ -297,9 +312,8 @@
name = "wooden chair"
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 20
hitsound = 'sound/weapons/genhit1.ogg'
origin_type = /obj/structure/chair/wood
break_chance = 50