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

Merge pull request #9615 from phil235/RuntimesFixes

Browse Source 
Runtime fixes and stuff.
This commit is contained in:
Cheridan
2015-05-24 19:40:53 -05:00
parent f5c0addf40 ec6e318343
commit ad8750eeb7
11 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+4 -1
View File
@@ -71,7 +71,10 @@
/obj/structure/closet,
/obj/item/weapon/storage,
/obj/structure/safe,
/obj/machinery/disposal
/obj/machinery/disposal,
/obj/machinery/r_n_d/destructive_analyzer,
/obj/machinery/r_n_d/experimentor,
/obj/machinery/autolathe
)
/obj/item/proc/check_allowed_items(atom/target, not_inside)
if((src in target) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)) || is_type_in_list(target, can_be_placed_into))
code/game/objects/items/toys.dm
+1 -1
View File
@@ -399,7 +399,7 @@
update_window(usr)
/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity) return
if(!proximity || !check_allowed_items(target)) return
if(!uses)
user << "<span class='warning'>There is no more of [src.name] left!</span>"
if(!instant)
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -41,7 +41,7 @@
M.slip(4, 2, src)
/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity)
if(!proximity || !check_allowed_items(target))
return
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
code/game/objects/items/weapons/extinguisher.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/item/weapon/extinguisher/afterattack(atom/target, mob/user , flag)
//TODO; Add support for reagents in water.
if(target.loc == user)//No more spraying yourself when putting your extinguisher away
if(target.loc == user || !check_allowed_items(target)) //No more spraying yourself when putting your extinguisher away
return
var/Refill = AttemptRefill(target, user)
if(Refill)
code/game/objects/items/weapons/janisigns.dm
-9
View File
@@ -12,15 +12,6 @@
origin_tech = "programming=3"
var/list/signs = list()
var/max_signs = 10
can_be_placed_into = list(
/obj/machinery/r_n_d/destructive_analyzer,
/obj/structure/table,
/obj/structure/rack,
/obj/structure/closet,
/obj/item/weapon/storage,
/obj/structure/safe,
/obj/machinery/disposal
)
/obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
if(flag)
code/game/objects/items/weapons/manuals.dm
+1
View File
@@ -287,6 +287,7 @@
name = "Mentoring your Experiments"
icon_state = "rdbook"
author = "Dr. H.P. Kritz"
title = "Mentoring your Experiments"
dat = {"<html>
<head>
<style>
code/modules/clothing/glasses/engine_goggles.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(!t_ray_on() || !(O in range(1, loc)))
invis_objects -= O
var/turf/T = O.loc
if(T.intact)
if(T && T.intact)
O.invisibility = 101
/obj/item/clothing/glasses/meson/engine/proc/t_ray_on()
code/modules/detectivework/footprints_and_rag.dm
-1
View File
@@ -17,7 +17,6 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5)
volume = 5
can_be_placed_into = null
/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
if(!proximity)
code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+21 -21
View File
@@ -1,7 +1,7 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass
name = "glass"
name = "drinking glass"
desc = "Your standard drinking glass."
icon_state = "glass_empty"
amount_per_transfer_from_this = 10
@@ -233,35 +233,35 @@
desc = "Ultimate refreshment."
if("tonic")
icon_state = "glass_clear"
name = "Glass of Tonic Water"
name = "glass of Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
if("sodawater")
icon_state = "glass_clear"
name = "Glass of Soda Water"
name = "glass of Soda Water"
desc = "Soda water. Why not make a scotch and soda?"
if("water")
icon_state = "glass_clear"
name = "Glass of Water"
name = "glass of Water"
desc = "The father of all refreshments."
if("spacemountainwind")
icon_state = "Space_mountain_wind_glass"
name = "Glass of Space Mountain Wind"
name = "glass of Space Mountain Wind"
desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
if("thirteenloko")
icon_state = "thirteen_loko_glass"
name = "Glass of Thirteen Loko"
name = "glass of Thirteen Loko"
desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
if("dr_gibb")
icon_state = "dr_gibb_glass"
name = "Glass of Dr. Gibb"
name = "glass of Dr. Gibb"
desc = "Dr. Gibb. Not as dangerous as the name might imply."
if("space_up")
icon_state = "space-up_glass"
name = "Glass of Space-up"
name = "glass of Space-up"
desc = "Space-up. It helps you keep your cool."
if("lemon_lime")
icon_state = "glass_yellow"
name = "Glass of Lemon-Lime"
name = "glass of Lemon-Lime"
desc = "You're pretty certain a real fruit has never actually touched this."
if("moonshine")
icon_state = "glass_clear"
@@ -269,23 +269,23 @@
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
if("soymilk")
icon_state = "glass_white"
name = "Glass of soy milk"
name = "glass of soy milk"
desc = "White and nutritious soy goodness!"
if("berryjuice")
icon_state = "berryjuice"
name = "Glass of berry juice"
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's jam. Who cares?"
if("poisonberryjuice")
icon_state = "poisonberryjuice"
name = "Glass of berry juice"
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's poison. Who cares?"
if("carrotjuice")
icon_state = "carrotjuice"
name = "Glass of carrot juice"
name = "glass of carrot juice"
desc = "It's just like a carrot but without crunching."
if("banana")
icon_state = "banana"
name = "Glass of banana juice"
name = "glass of banana juice"
desc = "The raw essence of a banana. HONK."
if("bahama_mama")
icon_state = "bahama_mama"
@@ -409,7 +409,7 @@
desc = "Only for the experienced. You think you see sand floating in the glass."
if("ice")
icon_state = "iceglass"
name = "Glass of ice"
name = "glass of ice"
desc = "Generally, you're supposed to put something else in there too..."
if("icecoffee")
icon_state = "icedcoffeeglass"
@@ -421,19 +421,19 @@
desc = "All natural, antioxidant-rich flavour sensation."
if("coffee")
icon_state = "glass_brown"
name = "Glass of coffee"
name = "glass of coffee"
desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
if("tea")
icon_state = "teaglass"
name = "Glass of tea"
name = "glass of tea"
desc = "Drinking it from here would not seem right."
if("bilk")
icon_state = "glass_brown"
name = "Glass of bilk"
name = "glass of bilk"
desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
if("welding_fuel")
icon_state = "dr_gibb_glass"
name = "Glass of welder fuel"
name = "glass of welder fuel"
desc = "Unless you're an industrial tool, this is probably not safe for consumption."
if("b52")
icon_state = "b52glass"
@@ -476,11 +476,11 @@
var/image/I = image(icon, "glassoverlay")
I.color = mix_color_from_reagents(reagents.reagent_list)
overlays += I
name = "Glass of ..what?"
name = "glass of ..what?"
desc = "You can't really tell what this is."
else
icon_state = "glass_empty"
name = "Drinking glass"
name = "drinking glass"
desc = "Your standard drinking glass."
return
code/modules/paperwork/photography.dm
+6 -5
View File
@@ -348,12 +348,13 @@ obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/
obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc)
var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
var/datum/picture/selection = selectpicture(targetloc)
P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
P.pixel_x = selection.fields["pixel_x"]
P.pixel_y = selection.fields["pixel_y"]
if(selection)
P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
P.pixel_x = selection.fields["pixel_x"]
P.pixel_y = selection.fields["pixel_y"]
P.show(usr)
usr << P.desc
P.show(usr)
usr << P.desc
qdel(P) //so 10 thousand picture items are not left in memory should an AI take them and then view them all
obj/item/device/camera/siliconcam/proc/viewpictures(user)
code/modules/reagents/reagent_containers/glass.dm
+3
View File
@@ -11,6 +11,9 @@
/obj/machinery/chem_heater/,
/obj/machinery/reagentgrinder,
/obj/machinery/biogenerator,
/obj/machinery/r_n_d/destructive_analyzer,
/obj/machinery/r_n_d/experimentor,
/obj/machinery/autolathe,
/obj/structure/table,
/obj/structure/rack,
/obj/structure/closet,