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

Conflict fixes

Browse Source
This commit is contained in:
Shadowlight213
2016-05-19 20:42:26 -07:00
parent fbeeaeae14 c468ef54c1
commit 86cbe14d15
417 changed files with 16131 additions and 7948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/chair.dm
+2 -1
View File
@@ -16,7 +16,8 @@
handle_layer()
/obj/structure/chair/deconstruct()
if(buildstacktype)
// If we have materials, and don't have the NOCONSTRUCT flag
if(buildstacktype && (!(flags & NODECONSTRUCT)))
new buildstacktype(loc,buildstackamount)
..()
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -395,7 +395,7 @@
add_fingerprint(user)
locked = !locked
user.visible_message("<span class='notice'>[user] [locked ? null : "un"]locks [src].</span>",
"<span class='notice'>You [locked ? null : "un"]locks [src].</span>")
"<span class='notice'>You [locked ? null : "un"]lock [src].</span>")
update_icon()
else
user << "<span class='notice'>Access Denied</span>"
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+9
View File
@@ -61,3 +61,12 @@
new /obj/item/stack/spacecash/c500(src)
for(var/i = 0, i < 6, i++)
new /obj/item/stack/spacecash/c200(src)
/obj/structure/closet/secure_closet/freezer/cream_pie
name = "cream pie closet"
desc = "Contains pies filled with cream and/or custard, you sickos."
req_access = list(access_theatre)
/obj/structure/closet/secure_closet/freezer/pie/New()
..()
new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1
View File
@@ -111,6 +111,7 @@
..()
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/device/flashlight/seclite(src)
code/game/objects/structures/flora.dm
+6 -21
View File
@@ -239,38 +239,23 @@
//a rock is flora according to where the icon file is
//and now these defines
/obj/structure/flora/rock
name = "rock"
desc = "a rock"
icon_state = "rock"
icon_state = "basalt"
desc = "A volcanic rock"
icon = 'icons/obj/flora/rocks.dmi'
anchored = 1
burn_state = FIRE_PROOF
density = 1
/obj/structure/flora/rock/New()
..()
icon_state = "[icon_state][rand(1,5)]"
/obj/structure/flora/rock/pile
name = "rocks"
desc = "some rocks"
icon_state = "rockpile"
density = 0
/obj/structure/flora/rock/volcanic
icon_state = "basalt"
desc = "A volcanic rock"
/obj/structure/flora/rock/volcanic/New()
..()
icon_state = "[icon_state][rand(1,3)]"
/obj/structure/flora/rock/pile/volcanic
/obj/structure/flora/rock/pile
icon_state = "lavarocks"
desc = "A pile of rocks"
/obj/structure/flora/rock/pile/volcanic/New()
/obj/structure/flora/rock/pile/New()
..()
icon_state = "[icon_state][rand(1,3)]"
code/game/objects/structures/girders.dm
+10 -9
View File
@@ -328,7 +328,7 @@
add_fingerprint(user)
if(istype(W, /obj/item/weapon/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
user.visible_message("<span class='warning'>[user] strikes [src] with [W]!</span>", "<span class='notice'>You demolish [src].</span>")
var/obj/item/stack/sheet/metal/R = new(get_turf(src))
var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
R.amount = 1
qdel(src)
@@ -342,7 +342,7 @@
return
user << "<span class='notice'>You slice apart the girder.</span>"
var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
R.amount = 2
R.amount = 1
transfer_fingerprints_to(R)
qdel(src)
@@ -352,7 +352,7 @@
if(do_after(user, 30, target = src))
user << "<span class='notice'>You slice apart the girder.</span>"
var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
R.amount = 2
R.amount = 1
transfer_fingerprints_to(R)
qdel(src)
@@ -367,15 +367,16 @@
else if(istype(W, /obj/item/stack/sheet/runed_metal))
var/obj/item/stack/sheet/runed_metal/R = W
if(R.amount < 2)
user << "<span class='warning'>You need at least two sheets of runed metal to construct a runed wall!</span>"
if(R.amount < 1)
user << "<span class='warning'>You need at least one sheet of runed metal to construct a runed wall!</span>"
return 0
user.visible_message("<span class='notice'>[user] begins laying runed metal on [src]...</span>", "<span class='notice'>You begin constructing a runed wall...</span>")
if(!do_after(user, 50, target = src))
return 0
user.visible_message("<span class='notice'>[user] plates [src] with runed metal.</span>", "<span class='notice'>You construct a runed wall.</span>")
R.use(2)
new/turf/closed/wall/cult(get_turf(src))
R.use(1)
var/turf/T = get_turf(src)
T.ChangeTurf(/turf/closed/wall/cult)
qdel(src)
else
@@ -390,9 +391,9 @@
qdel(src)
if(2)
if(prob(30))
new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2)
new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
qdel(src)
if(3)
if(prob(5))
new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2)
new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
qdel(src)
code/game/objects/structures/grille.dm
+10
View File
@@ -258,3 +258,13 @@
/obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
return 0
/obj/structure/grille/broken // Pre-broken grilles for map placement
icon_state = "brokengrille"
density = 0
health = 0
destroyed = 1
/obj/structure/grille/broken/New()
..()
stored.amount = 1
code/game/objects/structures/signs.dm
+6 -3
View File
@@ -27,7 +27,9 @@
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] unfastens [src].</span>", \
"<span class='notice'>You unfasten [src].</span>")
new /obj/item/sign_backing(get_turf(user))
var/obj/item/sign_backing/SB = new (get_turf(user))
SB.icon_state = icon_state
SB.sign_path = type
qdel(src)
else if(istype(O, /obj/item/weapon/pen))
var/list/sign_types = list("Secure Area", "Biohazard", "High Voltage", "Radiation", "Hard Vacuum Ahead", "Disposal: Leads To Space", "Danger: Fire", "No Smoking", "Medbay", "Science", "Chemistry", \
@@ -82,11 +84,12 @@
/obj/item/sign_backing
name = "sign backing"
desc = "A blank sign with adhesive backing."
desc = "A sign with adhesive backing."
icon = 'icons/obj/decals.dmi'
icon_state = "backing"
w_class = 3
burn_state = FLAMMABLE
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)
if(isturf(target) && proximity)
@@ -94,7 +97,7 @@
user.visible_message("<span class='notice'>[user] fastens [src] to [T].</span>", \
"<span class='notice'>You attach a blank sign to [T].</span>")
playsound(T, 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/structure/sign/basic(T)
new sign_path(T)
user.drop_item()
qdel(src)
else
code/game/objects/structures/window.dm
+28 -17
View File
@@ -14,10 +14,10 @@
var/reinf = 0
var/wtype = "glass"
var/fulltile = 0
var/list/storeditems = list()
// var/silicate = 0 // number of units of silicate
// var/icon/silicateIcon = null // the silicated icon
var/image/crack_overlay
var/list/debris = list()
can_be_unanchored = 1
/obj/structure/window/examine(mob/user)
@@ -32,21 +32,25 @@
if(reinf)
state = 2*anchored
spawn(5) // The NODECONSTRUCT flag gets added immediately by the holodeck (but not immediately enough)
if(!(flags & NODECONSTRUCT))
storeditems.Add(new/obj/item/weapon/shard(src))
if(fulltile)
storeditems.Add(new/obj/item/weapon/shard(src))
if(reinf)
var/obj/item/stack/rods/R = new/obj/item/stack/rods(src)
storeditems.Add(R)
if(fulltile)
R.add(1)
ini_dir = dir
air_update_turf(1)
return
// Precreate our own debris
var/shards = 1
if(fulltile)
shards++
var/rods = 0
if(reinf)
rods++
if(fulltile)
rods++
for(var/i in 1 to shards)
debris += new /obj/item/weapon/shard(src)
if(rods)
debris += new /obj/item/stack/rods(src, rods)
/obj/structure/window/bullet_act(obj/item/projectile/P)
. = ..()
@@ -65,7 +69,10 @@
shatter()
/obj/structure/window/narsie_act()
color = "#7D1919"
var/evil_color = "#7D1919"
color = evil_color
for(var/obj/item/weapon/shard/shard in debris)
shard.color = evil_color
/obj/structure/window/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
@@ -276,9 +283,13 @@
return
playsound(src, "shatter", 70, 1)
var/turf/T = loc
for(var/obj/item/I in storeditems)
I.loc = T
transfer_fingerprints_to(I)
if(!(flags & NODECONSTRUCT))
for(var/i in debris)
var/obj/item/I = i
I.loc = T
transfer_fingerprints_to(I)
qdel(src)
update_nearby_icons()