Added purple goggles for Lasty (and put two pairs in chemistry)

Added a third MMI to robotics (they have six flashes after all) Added monkey cubes to xenobio git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2219 316c924e-a436-60f5-8080-3fe189b3f50e
ZomgPonies · Sep 18, 2011 · e4ec81f · e4ec81f
1 parent 747c7f5
commit e4ec81f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
@@ -13,6 +13,12 @@
 	origin_tech = "magnets=2;engineering=2"
 	vision_flags = SEE_TURFS
 
+/obj/item/clothing/glasses/science
+	name = "SCIENCE GOGGLES"
+	desc = "nothing"
+	icon_state = "lasty"
+	item_state = "glasses"
+
 /obj/item/clothing/glasses/night
 	name = "Night Vision Goggles"
 	desc = "You can totally see in the dark now!."

diff --git a/icons/changelog.html b/icons/changelog.html
@@ -61,6 +61,12 @@ <h4>Changelog</h4>
     <li>Added the most fun activity in your every-day life. Laundry. Check the dormitory. (Sprites by Hempuli)</li>
   </ul>
   </li>
+  <li><b>Kor Updated:</b>
+  <ul>
+    <li>Added purple goggles to chemistry (you're welcome Lasty)</li>
+    <li>Added a third MMI to robotics and monkey cubes to xenobio (dont fucking spam them in the halls</li>
+  </ul>
+  </li>
 </ul>
 
 <b><font color='blue'>17 September 2011, Operation Market Garden remembrance day:</font><b>

diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
@@ -3393,7 +3393,7 @@
 "bnm" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Medbay"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bnn" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bno" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
-"bnp" = (/obj/table,/obj/item/weapon/screwdriver{pixel_x = 3; pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
+"bnp" = (/obj/table,/obj/item/weapon/screwdriver{pixel_x = 3; pixel_y = 4},/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
 "bnq" = (/obj/table,/obj/item/device/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/timer{pixel_x = -3; pixel_y = 3},/obj/machinery/camera{c_tag = "Chemistry South"; dir = 1; network = "SS13"; pixel_x = 22},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/requests_console{department = "Chemistry"; departmentType = 2; pixel_x = 0; pixel_y = -30},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
 "bnr" = (/obj/table,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
 "bns" = (/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
@@ -4674,7 +4674,7 @@
 "bLT" = (/obj/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Research Division Storage"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
 "bLU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"})
 "bLV" = (/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; pixel_x = -29; pixel_y = 1},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
-"bLW" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
+"bLW" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/item/weapon/monkeycube_box,/obj/item/weapon/monkeycube_box,/obj/table,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
 "bLX" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/disposal,/obj/disposalpipe/trunk,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
 "bLY" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/table,/obj/machinery/door_control{id = "xenobio"; name = "Containment Blast Doors"; pixel_x = -1; pixel_y = 7},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
 "bLZ" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/window/reinforced{dir = 4},/obj/table,/obj/item/weapon/melee/baton,/obj/item/weapon/wrench,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology)
@@ -5238,7 +5238,7 @@
 "bWL" = (/turf/simulated/wall/r_wall,/area/maintenance/portsolar)
 "bWM" = (/turf/simulated/wall,/area/maintenance/portsolar)
 "bWN" = (/obj/machinery/optable{id = "robotics"; name = "Robotics Operating Table"},/turf/simulated/floor,/area/assembly/assembly_line)
-"bWO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/table,/obj/item/device/mmi,/obj/item/device/mmi,/turf/simulated/floor,/area/assembly/assembly_line)
+"bWO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/table,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/turf/simulated/floor,/area/assembly/assembly_line)
 "bWP" = (/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
 "bWQ" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
 "bWR" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -5725,7 +5725,7 @@
 "cge" = (/obj/landmark/start,/turf/space,/area)
 "cgf" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Space Station 13"},/area)
 "cgg" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership)
-"cgh" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
+"cgh" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
 "cgi" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership)
 "cgj" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership)
 "cgk" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership)
@@ -5796,8 +5796,8 @@
 "chx" = (/obj/table,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "chy" = (/turf/unsimulated/wall,/area/centcom)
 "chz" = (/obj/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"chA" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
-"chB" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
+"chA" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
+"chB" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
 "chC" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom)
 "chD" = (/turf/unsimulated/floor{name = "plating"},/area/centcom)
 "chE" = (/obj/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
@@ -5857,7 +5857,7 @@
 "ciG" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/suppy)
 "ciH" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy)
 "ciI" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/centcom/suppy)
-"ciJ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
+"ciJ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
 "ciK" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
 "ciL" = (/obj/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
 "ciM" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
@@ -5875,7 +5875,7 @@
 "ciY" = (/obj/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
 "ciZ" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
 "cja" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
-"cjb" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
+"cjb" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
 "cjc" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/supply/dock)
 "cjd" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/supply/dock)
 "cje" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock)
@@ -6247,7 +6247,7 @@
 "cqg" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
 "cqh" = (/obj/stool/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cqi" = (/obj/machinery/computer/security,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cqj" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
+"cqj" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
 "cqk" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/ferry)
 "cql" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
 "cqm" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
@@ -6257,7 +6257,7 @@
 "cqq" = (/obj/stool/chair{dir = 8},/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control)
 "cqr" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cqs" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cqt" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry)
+"cqt" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry)
 "cqu" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/transport1/centcom)
 "cqv" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/transport1/centcom)
 "cqw" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/transport1/centcom)

diff --git a/tgstation.dme b/tgstation.dme
@@ -146,7 +146,6 @@
 #define FILE_DIR "icons/turf"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"