Skip to content

Commit

Permalink
Makes a few things in valhalla indestructible (#13519)
Browse files Browse the repository at this point in the history
* Makes a few things in valhalla indestructible

resistance_flags = 1 is INDESTRUCTIBLE, so they can't be destroyed by stray explosives anymore.

* Undo varedit, subtype /valhalla

* missed a vendor

* final review

I don't know why I made so many mistakes on such a simple PR

* Update Admin_Level.dmm
  • Loading branch information
Xander3359 authored Jul 21, 2023
1 parent f059df3 commit a77d117
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 15 deletions.
30 changes: 15 additions & 15 deletions _maps/map_files/generic/Admin_Level.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/glass/bottle/lemoline,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_y = 7
},
/turf/open/floor/mainship/sterile/dark,
Expand Down Expand Up @@ -1708,7 +1708,7 @@
/turf/open/floor/wood,
/area/centcom/valhalla/crew_quarters/heads/hop)
"cnE" = (
/obj/machinery/vending/engivend/nopower,
/obj/machinery/vending/engivend/nopower/valhalla,
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/plating,
/area/centcom/valhalla/security/brig/interiorcavern)
Expand Down Expand Up @@ -3393,7 +3393,7 @@
/area/centcom/valhalla/library)
"epz" = (
/obj/structure/table,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_y = 7
},
/obj/item/reagent_containers/glass/beaker/bluespace,
Expand Down Expand Up @@ -4915,7 +4915,7 @@
/turf/open/floor/tile/red/redblue/full,
/area/tdome/tdomeobserve)
"gzk" = (
/obj/machinery/vending/tool/nopower,
/obj/machinery/vending/tool/nopower/valhalla,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla/storage/primary)
"gzl" = (
Expand Down Expand Up @@ -4981,7 +4981,7 @@
/turf/open/floor/tile/dark,
/area/centcom/valhalla/chapel/main)
"gCD" = (
/obj/machinery/chem_master/nopower,
/obj/machinery/chem_master/nopower/valhalla,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla/security/brig/interiorcavern)
"gDc" = (
Expand Down Expand Up @@ -5165,7 +5165,7 @@
dir = 4
},
/obj/structure/table,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_y = 7
},
/obj/item/reagent_containers/glass/beaker/bluespace,
Expand Down Expand Up @@ -5792,7 +5792,7 @@
/obj/effect/turf_decal/warning_stripes/thick{
dir = 4
},
/obj/machinery/chem_master/nopower,
/obj/machinery/chem_master/nopower/valhalla,
/turf/open/floor/tile/lightred,
/area/centcom/valhalla/medical/chemistry)
"hMr" = (
Expand Down Expand Up @@ -5968,7 +5968,7 @@
/area/centcom/valhalla/comms)
"hXM" = (
/obj/effect/turf_decal/warning_stripes/box/empty,
/obj/machinery/vending/engivend/nopower,
/obj/machinery/vending/engivend/nopower/valhalla,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla/engine/engineering)
"hYu" = (
Expand Down Expand Up @@ -11939,7 +11939,7 @@
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla/primary/port)
"qlP" = (
/obj/machinery/vending/tool/nopower,
/obj/machinery/vending/tool/nopower/valhalla,
/obj/effect/turf_decal/warning_stripes/thick{
dir = 6
},
Expand Down Expand Up @@ -14018,7 +14018,7 @@
},
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_y = 5
},
/turf/open/floor/tile/vault{
Expand Down Expand Up @@ -15112,7 +15112,7 @@
pixel_x = -28
},
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/chem_master/nopower,
/obj/machinery/chem_master/nopower/valhalla,
/turf/open/floor/tile/lightred,
/area/centcom/valhalla/medical/medbay)
"ujt" = (
Expand Down Expand Up @@ -15492,7 +15492,7 @@
/turf/closed/wall,
/area/centcom/valhalla/janitor)
"uOI" = (
/obj/machinery/chem_master/nopower,
/obj/machinery/chem_master/nopower/valhalla,
/obj/structure/window/reinforced/extratoughened{
dir = 4
},
Expand Down Expand Up @@ -15732,7 +15732,7 @@
dir = 10
},
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_y = 7
},
/turf/open/floor/tile/lightred,
Expand Down Expand Up @@ -17102,7 +17102,7 @@
/obj/effect/turf_decal/warning_stripes/thick{
dir = 10
},
/obj/machinery/vending/tool/nopower,
/obj/machinery/vending/tool/nopower/valhalla,
/turf/open/floor/engine,
/area/centcom/valhalla/engine/engineering)
"wAR" = (
Expand Down Expand Up @@ -18246,7 +18246,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/black,
/obj/machinery/reagentgrinder/nopower{
/obj/machinery/reagentgrinder/nopower/valhalla{
pixel_x = -1;
pixel_y = 6
},
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1549,3 +1549,6 @@

/obj/machinery/vending/tool/nopower
use_power = NO_POWER_USE

/obj/machinery/vending/tool/nopower/valhalla
resistance_flags = INDESTRUCTIBLE
3 changes: 3 additions & 0 deletions code/game/objects/machinery/vending/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,9 @@
/obj/machinery/vending/engivend/nopower
use_power = NO_POWER_USE

/obj/machinery/vending/engivend/nopower/valhalla
resistance_flags = INDESTRUCTIBLE

//This one's from bay12
/obj/machinery/vending/robotics
name = "Robotech Deluxe"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/reagents/machinery/chem_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -423,5 +423,8 @@
/obj/machinery/chem_master/nopower
use_power = NO_POWER_USE

/obj/machinery/chem_master/nopower/valhalla
resistance_flags = INDESTRUCTIBLE

/obj/machinery/chem_master/condimaster/nopower
use_power = NO_POWER_USE
3 changes: 3 additions & 0 deletions code/modules/reagents/machinery/reagentgrinder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,6 @@

/obj/machinery/reagentgrinder/nopower
use_power = NO_POWER_USE

/obj/machinery/reagentgrinder/nopower/valhalla
resistance_flags = INDESTRUCTIBLE

0 comments on commit a77d117

Please sign in to comment.