Skip to content

Commit

Permalink
turned into proper prop and putted into the props.dm file
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien committed Jan 12, 2024
1 parent 2fd5be7 commit 24c428e
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 48 deletions.
30 changes: 30 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1372,3 +1372,33 @@
if(initial(emote.sound))
playsound(loc, initial(emote.sound), 50, FALSE)
return TRUE

//made into prop from an old destilery project abandon 9 year ago.

/obj/structure/prop/mill
name = "\improper Mill"
desc = "It is a machine that grinds produce."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/prop/fermenter
name = "\improper Fermenter"
desc = "It is a machine that ferments produce into alcoholic drinks."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/prop/still
name = "\improper Still"
desc = "It is a machine that produces hard liquor from alcoholic drinks."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/prop/squeezer
name = "\improper Squeezer"
desc = "It is a machine that squeezes extracts from produce."
icon_state = "autolathe"
density = TRUE
anchored = TRUE
32 changes: 1 addition & 31 deletions code/modules/destilery/main.dm
Original file line number Diff line number Diff line change
@@ -1,31 +1 @@
// Current phase : Turning all those outdated machines into "props".(incase i can't manage phase two.)
// Second phase : Remap and remove those from maps.(will be done independantly)
// Last phase : is to delete this file and is dme presence.

/obj/structure/machinery/mill
name = "\improper Mill"
desc = "It is a machine that grinds produce."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/machinery/fermenter
name = "\improper Fermenter"
desc = "It is a machine that ferments produce into alcoholic drinks."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/machinery/still
name = "\improper Still"
desc = "It is a machine that produces hard liquor from alcoholic drinks."
icon_state = "autolathe"
density = TRUE
anchored = TRUE

/obj/structure/machinery/squeezer
name = "\improper Squeezer"
desc = "It is a machine that squeezes extracts from produce."
icon_state = "autolathe"
density = TRUE
anchored = TRUE
//file to delete. don't forget dme file
10 changes: 5 additions & 5 deletions maps/map_files/BigRed/BigRed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3723,7 +3723,7 @@
},
/area/bigredv2/caves/lambda/xenobiology)
"akI" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor{
dir = 1;
icon_state = "whitegreen"
Expand Down Expand Up @@ -10069,7 +10069,7 @@
/turf/open/floor,
/area/bigredv2/outside/hydroponics)
"aCn" = (
/obj/structure/machinery/fermenter,
/obj/structure/prop/fermenter,
/turf/open/floor,
/area/bigredv2/outside/hydroponics)
"aCo" = (
Expand Down Expand Up @@ -11749,7 +11749,7 @@
},
/area/bigredv2/outside/bar)
"aGJ" = (
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor{
icon_state = "wood"
},
Expand Down Expand Up @@ -22470,7 +22470,7 @@
/turf/open/floor/plating,
/area/bigredv2/outside/engineering)
"bmp" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor{
dir = 1;
icon_state = "darkyellow2"
Expand Down Expand Up @@ -38436,7 +38436,7 @@
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
"uFp" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
"uFD" = (
Expand Down
8 changes: 4 additions & 4 deletions maps/map_files/DesertDam/Desert_Dam.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12676,7 +12676,7 @@
/turf/open/floor/plating,
/area/desert_dam/exterior/valley/valley_crashsite)
"aMk" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor/plating,
/area/desert_dam/exterior/valley/valley_crashsite)
"aMl" = (
Expand Down Expand Up @@ -29519,7 +29519,7 @@
},
/area/desert_dam/interior/dam_interior/workshop)
"bPQ" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor/prison{
icon_state = "sterile_white"
},
Expand Down Expand Up @@ -30711,7 +30711,7 @@
},
/area/desert_dam/building/security/prison)
"bTs" = (
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor/interior/wood,
/area/desert_dam/building/bar/backroom)
"bTt" = (
Expand Down Expand Up @@ -49264,7 +49264,7 @@
/turf/open/floor/prison,
/area/desert_dam/building/hydroponics/hydroponics)
"ddR" = (
/obj/structure/machinery/fermenter,
/obj/structure/prop/fermenter,
/turf/open/floor/prison,
/area/desert_dam/building/hydroponics/hydroponics)
"ddS" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
/turf/open/asphalt,
/area/desert_dam/exterior/valley/bar_valley_dam)
"hk" = (
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor/plating,
/area/desert_dam/building/bar/backroom)
"hm" = (
Expand Down
10 changes: 5 additions & 5 deletions maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3992,7 +3992,7 @@
},
/area/lv522/oob/w_y_vault)
"cbp" = (
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor{
icon_state = "wood"
},
Expand Down Expand Up @@ -13326,7 +13326,7 @@
},
/area/lv522/outdoors/colony_streets/windbreaker/observation)
"fRc" = (
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/floor/prison{
icon_state = "darkbrownfull2"
},
Expand Down Expand Up @@ -39738,7 +39738,7 @@
},
/area/lv522/indoors/a_block/admin)
"pDe" = (
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor/prison{
dir = 4;
icon_state = "greenfull"
Expand Down Expand Up @@ -48184,7 +48184,7 @@
/obj/structure/platform{
dir = 1
},
/obj/structure/machinery/squeezer,
/obj/structure/prop/squeezer,
/turf/open/floor/plating,
/area/lv522/indoors/c_block/cargo)
"sBH" = (
Expand Down Expand Up @@ -50462,7 +50462,7 @@
/obj/structure/prop/invuln/ice_prefab/trim{
dir = 8
},
/obj/structure/machinery/mill,
/obj/structure/prop/mill,
/turf/open/auto_turf/shale/layer1,
/area/lv522/outdoors/colony_streets/central_streets)
"trZ" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/LV624/LV624.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7626,14 +7626,14 @@
},
/area/lv624/lazarus/quart)
"aHm" = (
/obj/structure/machinery/fermenter,
/obj/structure/prop/fermenter,
/turf/open/floor{
dir = 4;
icon_state = "whiteyellowfull"
},
/area/lv624/lazarus/quart)
"aHn" = (
/obj/structure/machinery/still,
/obj/structure/prop/still,
/turf/open/floor{
dir = 4;
icon_state = "whiteyellowfull"
Expand Down

0 comments on commit 24c428e

Please sign in to comment.