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

Merge remote-tracking branch 'upstream/master' into Impropermaterials

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-13 08:58:40 -04:00
parent ffa823e5b9 803b6dfd87
commit 9b668de7bb
271 changed files with 758 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bedsheet_bin.dm
+2 -2
View File
@@ -11,11 +11,11 @@ LINEN BINS
icon_state = "sheetwhite"
item_state = "bedsheet"
slot_flags = SLOT_BACK
layer = 4.0
layer = 4
throwforce = 0
throw_speed = 1
throw_range = 2
w_class = 1.0
w_class = 1
item_color = "white"
burn_state = 0 //Burnable
code/game/objects/structures/electricchair.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Looks absolutely SHOCKING!"
icon_state = "echair0"
var/obj/item/assembly/shock_kit/part = null
var/last_time = 1.0
var/last_time = 1
/obj/structure/stool/bed/chair/e_chair/New()
..()
code/game/objects/structures/extinguisher.dm
+3 -3
View File
@@ -11,16 +11,16 @@
/obj/structure/extinguisher_cabinet/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
return
if(2.0)
if(2)
if(prob(50))
if(has_extinguisher)
has_extinguisher.loc = src.loc
qdel(src)
return
if(3.0)
if(3)
return
code/game/objects/structures/fireaxe.dm
+3 -3
View File
@@ -49,15 +49,15 @@
/obj/structure/fireaxecabinet/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
return
if(2.0)
if(2)
if(prob(50) && fireaxe)
fireaxe.loc = src.loc
qdel(src)
return
if(3.0)
if(3)
return
/obj/structure/fireaxecabinet/bullet_act(obj/item/projectile/Proj)
code/game/objects/structures/girders.dm
+9 -9
View File
@@ -229,14 +229,14 @@
/obj/structure/girder/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
if(2.0)
if(2)
if (prob(70))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
qdel(src)
if(3.0)
if(3)
if (prob(40))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
@@ -258,14 +258,14 @@
/obj/structure/girder/reinforced/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
if(2.0)
if(2)
if (prob(30))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
qdel(src)
if(3.0)
if(3)
if (prob(5))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
@@ -320,13 +320,13 @@
/obj/structure/cultgirder/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
if(2.0)
if(2)
if(prob(30))
new /obj/effect/decal/remains/human(loc)
qdel(src)
if(3.0)
if(3)
if(prob(5))
new /obj/effect/decal/remains/human(loc)
qdel(src)
code/game/objects/structures/lattice.dm
+4 -4
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/structures.dmi'
icon_state = "latticefull"
density = 0
anchored = 1.0
anchored = 1
layer = 2.3 //under pipes
var/obj/item/stack/rods/stored
// flags = CONDUCT
@@ -39,13 +39,13 @@
/obj/structure/lattice/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
return
if(2.0)
if(2)
qdel(src)
return
if(3.0)
if(3)
return
else
return
code/game/objects/structures/morgue.dm
+2 -2
View File
@@ -16,7 +16,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "morgue1"
density = 1
anchored = 1.0
anchored = 1
var/obj/structure/tray/connected = null
var/locked = 0
@@ -206,7 +206,7 @@ var/global/list/crematoriums = new/list()
density = 1
layer = 2.9
var/obj/structure/bodycontainer/connected = null
anchored = 1.0
anchored = 1
pass_flags = LETPASSTHROW
/obj/structure/tray/Destroy()
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -78,7 +78,7 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
w_class = 4.0 // Can't be put in backpacks.
w_class = 4 // Can't be put in backpacks.
/obj/item/roller/attack_self(mob/user)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+4 -4
View File
@@ -3,19 +3,19 @@
desc = "Apply butt."
icon = 'icons/obj/objects.dmi'
icon_state = "stool"
anchored = 1.0
anchored = 1
/obj/structure/stool/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
return
if(2.0)
if(2)
if (prob(70))
new /obj/item/stack/sheet/metal(loc)
qdel(src)
return
if(3.0)
if(3)
if (prob(50))
new /obj/item/stack/sheet/metal(loc)
qdel(src)
code/game/objects/structures/tables_racks.dm
+5 -5
View File
@@ -18,7 +18,7 @@
icon = 'icons/obj/smooth_structures/table.dmi'
icon_state = "table"
density = 1
anchored = 1.0
anchored = 1
layer = 2.8
pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.")
var/frame = /obj/structure/table_frame
@@ -363,20 +363,20 @@
icon = 'icons/obj/objects.dmi'
icon_state = "rack"
density = 1
anchored = 1.0
anchored = 1
pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.
var/health = 5
/obj/structure/rack/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
if(2.0)
if(2)
if(prob(50))
rack_destroy()
else
qdel(src)
if(3.0)
if(3)
if(prob(25))
rack_destroy()
code/game/objects/structures/tank_dispenser.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "dispenser"
density = 1
anchored = 1.0
anchored = 1
var/oxygentanks = 10
var/plasmatanks = 10
var/list/oxytanks = list() //sorry for the similar var names
code/game/objects/structures/transit_tubes/transit_tube.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_state = "E-W"
density = 1
layer = 3.1
anchored = 1.0
anchored = 1
var/tube_construction = /obj/structure/c_transit_tube
var/list/tube_dirs = null
var/exit_delay = 1
code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "E-W" //icon_state decides which tube will be built
density = 0
layer = 3.1 //same as the built tube
anchored = 0.0
anchored = 0
//wrapper for turn that changes the transit tube formatted icon_state instead of the dir
/obj/structure/c_transit_tube/proc/tube_turn(angle)
@@ -138,5 +138,5 @@
name = "unattached transit tube pod"
icon = 'icons/obj/atmospherics/pipes/transit_tube_pod.dmi'
icon_state = "pod"
anchored = 0.0
anchored = 0
density = 0
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+1 -1
View File
@@ -2,7 +2,7 @@
icon = 'icons/obj/atmospherics/pipes/transit_tube_pod.dmi'
icon_state = "pod"
animate_movement = FORWARD_STEPS
anchored = 1.0
anchored = 1
density = 1
var/moving = 0
var/datum/gas_mixture/air_contents = new()
code/game/objects/structures/window.dm
+3 -3
View File
@@ -53,13 +53,13 @@
/obj/structure/window/ex_act(severity, target)
switch(severity)
if(1.0)
if(1)
qdel(src)
return
if(2.0)
if(2)
spawnfragments()
return
if(3.0)
if(3)
if(prob(50))
spawnfragments()
return