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

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

Browse Source 
Conflicts:
	code/modules/mining/mine_items.dm
This commit is contained in:
Jordie0608
2015-04-17 18:02:45 +10:00
parent 8610d24a75 4c100c1ff7
commit 26ca19e07d
246 changed files with 5225 additions and 2202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsigns.dm
+13 -9
View File
@@ -142,55 +142,55 @@
/datum/barsign/maltesefalcon
name = "Maltese Falcon"
icon = "maltesefalcon"
desc = "The Maltese Falcon, Space Bar and Grill"
desc = "The Maltese Falcon, Space Bar and Grill."
/datum/barsign/thebark
name = "The Bark"
icon = "thebark"
desc = "Ian's bar of choice"
desc = "Ian's bar of choice."
/datum/barsign/harmbaton
name = "The Harmbaton"
icon = "theharmbaton"
desc = "A great dining experience for both security members and assistants"
desc = "A great dining experience for both security members and assistants."
/datum/barsign/thesingulo
name = "The Singulo"
icon = "thesingulo"
desc = "Where people go that'd rather not be called by their name"
desc = "Where people go that'd rather not be called by their name."
/datum/barsign/thedrunkcarp
name = "The Drunk Carp"
icon = "thedrunkcarp"
desc = "Don't drink and Swim"
desc = "Don't drink and swim."
/datum/barsign/scotchservinwill
name = "Scotch Servin Willy's"
icon = "scotchservinwill"
desc = "Willy sure moved up in the world from clown to bartender"
desc = "Willy sure moved up in the world from clown to bartender."
/datum/barsign/officerbeersky
name = "Officer Beersky's"
icon = "officerbeersky"
desc = "Man eat a dong, these drinks are great"
desc = "Man eat a dong, these drinks are great."
/datum/barsign/thecavern
name = "The Cavern"
icon = "thecavern"
desc = "Fine drinks while listening to some fine tunes"
desc = "Fine drinks while listening to some fine tunes."
/datum/barsign/theouterspess
name = "The Outer Spess"
icon = "theouterspess"
desc = "This bar isn't actually located in outer space"
desc = "This bar isn't actually located in outer space."
/datum/barsign/slipperyshots
@@ -268,6 +268,10 @@
icon = "thealenath"
desc = "All right, buddy. I think you've had EI NATH. Time to get a cab."
/datum/barsign/thealohasnackbar
name = "The Aloha Snackbar"
icon = "alohasnackbar"
desc = "A tasteful, inoffensive tiki bar sign."
/datum/barsign/hiddensigns
code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+1 -1
View File
@@ -49,7 +49,7 @@
new /obj/item/weapon/storage/firstaid/brute(src)
new /obj/item/weapon/storage/firstaid/regular(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/defibrillator/compact/combat(src)
new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
new /obj/machinery/bot/medbot(src)
/obj/structure/closet/secure_closet/ertEngi
code/game/objects/structures/door_assembly.dm
+4 -6
View File
@@ -525,21 +525,19 @@ obj/structure/door_assembly/New()
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("<span class='warning'>[user] installs the electronics into the airlock assembly.</span>", \
"You start to install electronics into the airlock assembly.")
user.drop_item()
W.loc = src
if(do_after(user, 40))
if( src.state != 1 )
W.loc = src.loc
return
user.drop_item()
W.loc = src
user << "<span class='notice'> You've installed the airlock electronics.</span>"
src.state = 2
src.name = "near finished airlock assembly"
src.electronics = W
else
W.loc = src.loc
//qdel(W)
else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -221,7 +221,7 @@
if(world.time > last_event+15)
active = 1
for(var/mob/living/L in range(3,src))
L.apply_effect(12,IRRADIATE,0)
L.irradiate(12)
for(var/turf/simulated/wall/mineral/uranium/T in range(3,src))
T.radiate()
last_event = world.time
code/game/objects/structures/grille.dm
+2
View File
@@ -118,6 +118,8 @@
return
/obj/structure/grille/Deconstruct()
if(!loc) //if already qdel'd somehow, we do nothing
return
transfer_fingerprints_to(stored)
var/turf/T = loc
stored.loc = T
code/game/objects/structures/statues.dm
+1 -1
View File
@@ -180,7 +180,7 @@
if(world.time > last_event+15)
active = 1
for(var/mob/living/L in range(3,src))
L.apply_effect(12,IRRADIATE,0)
L.irradiate(12)
last_event = world.time
active = null
return
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+5 -5
View File
@@ -55,12 +55,12 @@
if(M == buckled_mob)
M.pixel_y = 0
M.pixel_x = initial(M.pixel_x) + 2
overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=6)
M.layer = MOB_LAYER - 0.3
overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2)
else
M.pixel_x = initial(M.pixel_x)
M.pixel_y = initial(M.pixel_y)
if(M.lying)
M.pixel_y = M.lying_pixel_offset
M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
M.layer = initial(M.layer)
overlays.Cut()
/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2 -3
View File
@@ -68,9 +68,8 @@
else
density = 0
icon_state = "down"
M.pixel_y = initial(M.pixel_y)
if(M.lying)
M.pixel_y = M.lying_pixel_offset
M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
/obj/item/roller
code/game/objects/structures/window.dm
+19 -22
View File
@@ -16,20 +16,25 @@
var/disassembled = 0
var/wtype = "glass"
var/fulltile = 0
var/obj/item/stack/rods/storedrods
var/obj/item/weapon/shard/storedshard
var/list/storeditems = list()
// var/silicate = 0 // number of units of silicate
// var/icon/silicateIcon = null // the silicated icon
/obj/structure/window/New(Loc,re=0)
..()
health = maxhealth
if(re) reinf = re
storedshard = new/obj/item/weapon/shard(src)
if(re)
reinf = re
storeditems.Add(new/obj/item/weapon/shard(src))
if(fulltile)
storeditems.Add(new/obj/item/weapon/shard(src))
ini_dir = dir
if(reinf)
state = 2*anchored
storedrods = new/obj/item/stack/rods(src)
var/obj/item/stack/rods/R = new/obj/item/stack/rods(src)
storeditems.Add(R)
if(fulltile)
R.add(1)
air_update_turf(1)
update_nearby_icons()
@@ -123,9 +128,7 @@
..(user, 1)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
storedshard.add_fingerprint(user)
if(storedrods)
storedrods.add_fingerprint(user)
add_fingerprint(user)
hit(50)
return 1
@@ -279,29 +282,23 @@
return 1
/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
if(reinf) damage *= 0.5
if(reinf)
damage *= 0.5
health = max(0, health - damage)
update_nearby_icons()
if(sound_effect)
playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
if(health <= 0)
if(dir == SOUTHWEST)
var/index = null
index = 0
while(index < 2)
spawnfragments()
index++
else
spawnfragments()
spawnfragments()
return
/obj/structure/window/proc/spawnfragments()
if(!loc) //if already qdel'd somehow, we do nothing
return
var/turf/T = loc
storedshard.loc = T
transfer_fingerprints_to(storedshard)
if(storedrods)
storedrods.loc = T
transfer_fingerprints_to(storedrods)
for(var/obj/item/I in storeditems)
I.loc = T
transfer_fingerprints_to(I)
qdel(src)
update_nearby_icons()