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

Merge branch 'master' of https://github.com/tgstation/-tg-station into hold_it

Browse Source 
# Conflicts:
#	code/modules/clothing/under/ties.dm
This commit is contained in:
Incoming
2016-09-30 13:00:49 -04:00
parent 29830a9224 9066920521
commit 5eacff1038
371 changed files with 2567 additions and 2258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ai_core.dm
+1
View File
@@ -156,6 +156,7 @@
return
ticker.mode.remove_antag_for_borging(M.brainmob.mind)
remove_servant_of_ratvar(M, TRUE)
M.loc = src
brain = M
user << "<span class='notice'>Added a brain.</span>"
code/game/objects/structures/aliens.dm
+1 -1
View File
@@ -119,7 +119,7 @@
if(3)
take_damage(50, BRUTE, 0)
/obj/structure/alien/blob_act(obj/effect/blob/B)
/obj/structure/alien/blob_act(obj/structure/blob/B)
take_damage(50, BRUTE, 0)
/obj/structure/alien/resin/hitby(atom/movable/AM)
code/game/objects/structures/artstuff.dm
+2 -2
View File
@@ -9,7 +9,7 @@
icon = 'icons/obj/artstuff.dmi'
icon_state = "easel"
density = 1
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 15
var/obj/item/weapon/canvas/painting = null
@@ -51,7 +51,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
desc = "draw out your soul on this canvas!"
icon = 'icons/obj/artstuff.dmi'
icon_state = "11x11"
burn_state = FLAMMABLE
resistance_flags = 0
var/whichGlobalBackup = 1 //List index
/obj/item/weapon/canvas/nineteenXnineteen
code/game/objects/structures/beds_chairs/bed.dm
+2 -2
View File
@@ -15,7 +15,7 @@
anchored = 1
can_buckle = 1
buckle_lying = 1
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
@@ -61,7 +61,7 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
var/foldabletype = /obj/item/roller
/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
code/game/objects/structures/beds_chairs/chair.dm
+4 -4
View File
@@ -6,7 +6,7 @@
anchored = 1
can_buckle = 1
buckle_lying = 0 //you sit in a chair, not lay
burn_state = FIRE_PROOF
resistance_flags = 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
@@ -118,7 +118,7 @@
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 3
@@ -139,7 +139,7 @@
desc = "It looks comfy.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "comfychair"
color = rgb(255,255,255)
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 30
buildstackamount = 2
var/image/armrest = null
@@ -308,7 +308,7 @@
name = "wooden chair"
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
hitsound = 'sound/weapons/genhit1.ogg'
origin_type = /obj/structure/chair/wood
code/game/objects/structures/bedsheet_bin.dm
+2 -2
View File
@@ -17,7 +17,7 @@ LINEN BINS
throw_range = 2
w_class = 1
item_color = "white"
burn_state = FLAMMABLE
resistance_flags = 0
dog_fashion = /datum/dog_fashion/head/ghost
@@ -205,7 +205,7 @@ LINEN BINS
icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = 1
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
var/amount = 10
var/list/sheets = list()
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon_state = "cardboard"
health = 10
mob_storage_capacity = 1
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
can_weld_shut = 0
cutting_tool = /obj/item/weapon/wirecutters
@@ -61,7 +61,7 @@
icon_state = "metalbox"
health = 500
mob_storage_capacity = 5
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
move_speed_multiplier = 2
cutting_tool = /obj/item/weapon/weldingtool
open_sound = 'sound/machines/click.ogg'
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+3 -3
View File
@@ -2,7 +2,7 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
/obj/structure/closet/acloset
@@ -72,7 +72,7 @@
new /obj/item/weapon/storage/box/flashbangs(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/helmet/thunderdome(src)
/obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet"
icon_door = "green"
@@ -91,7 +91,7 @@
new /obj/item/weapon/storage/box/flashbangs(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/helmet/thunderdome(src)
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -121,7 +121,7 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
/obj/structure/closet/wardrobe/red
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "booze storage"
req_access = list(access_bar)
icon_state = "cabinet"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
/obj/structure/closet/secure_closet/bar/New()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
/obj/structure/closet/secure_closet/personal/cabinet/New()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -1
View File
@@ -157,7 +157,7 @@
name = "\proper detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinet"
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
/obj/structure/closet/secure_closet/detective/New()
code/game/objects/structures/crates_lockers/closets/statue.dm
+1 -1
View File
@@ -120,7 +120,7 @@
if(user.environment_smash)
shatter()
/obj/structure/closet/statue/blob_act(obj/effect/blob/B)
/obj/structure/closet/statue/blob_act(obj/structure/blob/B)
shatter()
/obj/structure/closet/statue/attacked_by(obj/item/I, mob/living/user)
code/game/objects/structures/displaycase.dm
+2 -2
View File
@@ -5,7 +5,7 @@
desc = "A display case for prized possessions."
density = 1
anchored = 1
unacidable = 1//Dissolving the case would also delete the gun.
resistance_flags = FIRE_PROOF | ACID_PROOF
var/health = 30
var/destroyed = 0
var/obj/item/showpiece = null
@@ -48,7 +48,7 @@
showpiece.loc = src.loc
showpiece = null
/obj/structure/displaycase/blob_act(obj/effect/blob/B)
/obj/structure/displaycase/blob_act(obj/structure/blob/B)
take_damage(30)
/obj/structure/displaycase/hitby(atom/movable/AM)
code/game/objects/structures/fireaxe.dm
+2 -1
View File
@@ -6,6 +6,7 @@
icon_state = "fireaxe"
anchored = 1
density = 0
armor = list(melee = 50, bullet = 20, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
var/locked = 1
var/open = 0
var/health = 60
@@ -82,7 +83,7 @@
take_damage(P.damage, P.damage_type, 0)
/obj/structure/fireaxecabinet/blob_act(obj/effect/blob/B)
/obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B)
if(fireaxe)
fireaxe.forceMove(loc)
qdel(src)
code/game/objects/structures/fireplace.dm
+1 -1
View File
@@ -10,7 +10,7 @@
density = FALSE
anchored = TRUE
pixel_x = -16
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
var/lit = FALSE
var/fuel_added = 0
code/game/objects/structures/flora.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/structure/flora
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 30
anchored = 1
@@ -290,7 +290,7 @@
icon_state = "basalt"
desc = "A volcanic rock"
icon = 'icons/obj/flora/rocks.dmi'
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
density = 1
/obj/structure/flora/rock/New()
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -272,7 +272,7 @@
qdel(src)
/obj/structure/girder/blob_act(obj/effect/blob/B)
/obj/structure/girder/blob_act(obj/structure/blob/B)
if(prob(40))
qdel(src)
code/game/objects/structures/grille.dm
+2 -1
View File
@@ -9,6 +9,7 @@
pressure_resistance = 5*ONE_ATMOSPHERE
layer = BELOW_OBJ_LAYER
var/health = 10
armor = list(melee = 50, bullet = 70, laser = 70, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
var/destroyed = 0
var/obj/item/stack/rods/stored
@@ -31,7 +32,7 @@
new /obj/structure/grille/ratvar(src.loc)
qdel(src)
/obj/structure/grille/blob_act(obj/effect/blob/B)
/obj/structure/grille/blob_act(obj/structure/blob/B)
if(!destroyed)
Break()
code/game/objects/structures/guncase.dm
+3 -1
View File
@@ -76,7 +76,9 @@
/obj/structure/guncase/Topic(href, href_list)
if(href_list["retrieve"])
var/obj/item/O = locate(href_list["retrieve"])
var/obj/item/O = locate(href_list["retrieve"]) in contents
if(!O || !istype(O))
return
if(!usr.canUseTopic(src))
return
if(ishuman(usr))
code/game/objects/structures/lattice.dm
+2 -1
View File
@@ -5,6 +5,7 @@
icon_state = "lattice"
density = 0
anchored = 1
armor = list(melee = 100, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
layer = LATTICE_LAYER //under pipes
var/obj/item/stack/rods/stored
canSmoothWith = list(/obj/structure/lattice,
@@ -26,7 +27,7 @@
stored = null
return ..()
/obj/structure/lattice/blob_act(obj/effect/blob/B)
/obj/structure/lattice/blob_act(obj/structure/blob/B)
return
/obj/structure/lattice/ex_act(severity, target)
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -243,5 +243,5 @@
openSound = 'sound/effects/doorcreaky.ogg'
closeSound = 'sound/effects/doorcreaky.ogg'
sheetType = /obj/item/stack/sheet/mineral/wood
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 30
code/game/objects/structures/safe.dm
+1 -1
View File
@@ -164,7 +164,7 @@ FLOOR SAFES
return ..()
obj/structure/safe/blob_act(obj/effect/blob/B)
obj/structure/safe/blob_act(obj/structure/blob/B)
return
obj/structure/safe/ex_act(severity, target)
code/game/objects/structures/signs.dm
+2 -2
View File
@@ -13,7 +13,7 @@
/obj/structure/sign/ex_act(severity, target)
qdel(src)
/obj/structure/sign/blob_act(obj/effect/blob/B)
/obj/structure/sign/blob_act(obj/structure/blob/B)
qdel(src)
/obj/structure/sign/attackby(obj/item/O, mob/user, params)
@@ -87,7 +87,7 @@
icon = 'icons/obj/decals.dmi'
icon_state = "backing"
w_class = 3
burn_state = FLAMMABLE
resistance_flags = 0
var/sign_path = /obj/structure/sign/basic //the type of sign that will be created when placed on a turf
/obj/item/sign_backing/afterattack(atom/target, mob/user, proximity)
code/game/objects/structures/table_frames.dm
+1 -1
View File
@@ -96,7 +96,7 @@
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
burn_state = FLAMMABLE
resistance_flags = 0
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stack/sheet/mineral/wood))
code/game/objects/structures/tables_racks.dm
+4 -3
View File
@@ -53,7 +53,7 @@
if(3)
take_damage(rand(40,80), BRUTE, 0)
/obj/structure/table/blob_act(obj/effect/blob/B)
/obj/structure/table/blob_act(obj/structure/blob/B)
take_damage(rand(75,150), BRUTE, 0)
/obj/structure/table/narsie_act()
@@ -315,7 +315,7 @@
frame = /obj/structure/table_frame/wood
framestack = /obj/item/stack/sheet/mineral/wood
buildstack = /obj/item/stack/sheet/mineral/wood
burn_state = FLAMMABLE
resistance_flags = 0
burntime = 20
canSmoothWith = list(/obj/structure/table/wood,
/obj/structure/table/wood/poker,
@@ -364,6 +364,7 @@
buildstack = /obj/item/stack/sheet/plasteel
canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
health = 200
armor = list(melee = 10, bullet = 10, laser = 10, energy = 100, bomb = 20, bio = 0, rad = 0, fire = 0, acid = 70)
/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/weldingtool))
@@ -476,7 +477,7 @@
if(3)
take_damage(rand(5,25), BRUTE, 0)
/obj/structure/rack/blob_act(obj/effect/blob/B)
/obj/structure/rack/blob_act(obj/structure/blob/B)
rack_destroy()
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -332,7 +332,7 @@
if(H.w_uniform.clean_blood())
H.update_inv_w_uniform()
if(washgloves)
clean_blood()
H.clean_blood()
if(H.shoes && washshoes)
if(H.shoes.clean_blood())
H.update_inv_shoes()
code/game/objects/structures/window.dm
+3 -1
View File
@@ -65,7 +65,7 @@
if(3)
take_damage(rand(25,75), BRUTE, 0)
/obj/structure/window/blob_act(obj/effect/blob/B)
/obj/structure/window/blob_act(obj/structure/blob/B)
take_damage(rand(75,150), BRUTE, 0)
/obj/structure/window/narsie_act()
@@ -434,6 +434,7 @@
name = "reinforced window"
icon_state = "rwindow"
reinf = 1
armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 0, acid = 0)
maxhealth = 50
explosion_block = 1
@@ -494,6 +495,7 @@
wtype = "shuttle"
fulltile = 1
reinf = 1
armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 0, acid = 0)
smooth = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 1