A couple of small changes before I tackle the buffing-up project.

Luminosity
Admins editing the luminosity var now properly uses sd_SetLuminosity().
 Britcup
A cup spawns for Kingston in hydroponics.
 Taser guns
New sprites, courtesy of Arcalane. Now with an actual 4-shot gauge!
 Interface
16x16 mode re-enabled for shits and giggles.
 Mining
Reverted the uranium ore sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1507 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2011-04-29 14:27:49 +00:00
parent 4c28bdff21
commit 26e33a0a3c
10 changed files with 37 additions and 11 deletions

View File

@@ -2234,6 +2234,12 @@
icon_state = "flask" icon_state = "flask"
volume = 60 volume = 60
/obj/item/weapon/reagent_containers/food/drinks/britcup
name = "cup"
desc = "A cup with the british flag emblazoned on it."
icon_state = "britcup"
volume = 30
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
name = "glass" name = "glass"
desc = "Your standard drinking glass." desc = "Your standard drinking glass."

View File

@@ -145,23 +145,37 @@
A.vars[variable] = O.vars[variable] A.vars[variable] = O.vars[variable]
if("num") if("num")
O.vars[variable] = input("Enter new number:","Num",\ var/new_value = input("Enter new number:","Num",\
O.vars[variable]) as num O.vars[variable]) as num
if(variable=="luminosity")
O.sd_SetLuminosity(new_value)
else
O.vars[variable] = new_value
if(istype(O, /mob)) if(istype(O, /mob))
for(var/mob/M in world) for(var/mob/M in world)
if (M.type == O.type) if (M.type == O.type)
M.vars[variable] = O.vars[variable] if(variable=="luminosity")
M.sd_SetLuminosity(new_value)
else
M.vars[variable] = O.vars[variable]
else if(istype(O, /obj)) else if(istype(O, /obj))
for(var/obj/A in world) for(var/obj/A in world)
if (A.type == O.type) if (A.type == O.type)
A.vars[variable] = O.vars[variable] if(variable=="luminosity")
A.sd_SetLuminosity(new_value)
else
A.vars[variable] = O.vars[variable]
else if(istype(O, /turf)) else if(istype(O, /turf))
for(var/turf/A in world) for(var/turf/A in world)
if (A.type == O.type) if (A.type == O.type)
A.vars[variable] = O.vars[variable] if(variable=="luminosity")
A.sd_SetLuminosity(new_value)
else
A.vars[variable] = O.vars[variable]
if("type") if("type")
O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \ O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \

View File

@@ -93,7 +93,6 @@
if("No") if("No")
L += var_value L += var_value
/client/proc/mod_list(var/list/L) /client/proc/mod_list(var/list/L)
if(!istype(L,/list)) src << "Not a List." if(!istype(L,/list)) src << "Not a List."
@@ -343,8 +342,13 @@
O.vars[variable]) as text O.vars[variable]) as text
if("num") if("num")
O.vars[variable] = input("Enter new number:","Num",\ if(variable=="luminosity")
O.vars[variable]) as num var/new_value = input("Enter new number:","Num",\
O.vars[variable]) as num
O.sd_SetLuminosity(new_value)
else
O.vars[variable] = input("Enter new number:","Num",\
O.vars[variable]) as num
if("type") if("type")
O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \ O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \

View File

@@ -5,6 +5,8 @@ herpa - Game Master
scaredofshadows - Game Master scaredofshadows - Game Master
chicagoted - Game Master chicagoted - Game Master
neofite - Game Master neofite - Game Master
uristmcdorf - Game Master
cinless - Game Master
mport2004 - Game Admin mport2004 - Game Admin
lj82 - Game Admin lj82 - Game Admin

View File

@@ -1 +1 @@
traitor extended

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -133,7 +133,7 @@ menu "menu"
is-checked = false is-checked = false
can-check = true can-check = true
group = "size" group = "size"
is-disabled = true is-disabled = false
saved-params = "is-checked" saved-params = "is-checked"
elem elem
name = "" name = ""

View File

@@ -1531,7 +1531,7 @@
"aDw" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/library) "aDw" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/library)
"aDx" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aDx" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aDy" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/hydroponics) "aDy" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/hydroponics)
"aDz" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aDz" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."; layer = 4},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aDA" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aDA" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aDB" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aDB" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aDC" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aDC" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)