From c2d3ad9c3f4ec80ac41b2610a650c1a469bb22fa Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:15:18 -0600 Subject: [PATCH] Update RPD.dm --- code/game/objects/items/RPD.dm | 96 ---------------------------------- 1 file changed, 96 deletions(-) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 90558e86d8..563d6ae764 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -86,12 +86,6 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( /datum/pipe_info/pipe/Params() return "makepipe=[id]&type=[dirtype]" -<<<<<<< HEAD -/datum/pipe_info/pipe/Render(dispenser,label,dir=NORTH) - return "
  • [label]
    • " -======= ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435) - /datum/pipe_info/meter categoryId = CATEGORY_ATMOS icon = 'icons/obj/atmospherics/pipes/simple.dmi' @@ -103,25 +97,6 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( /datum/pipe_info/meter/Params() return "makemeter=1&type=[dirtype]" -<<<<<<< HEAD -/datum/pipe_info/meter/Render(dispenser,label) - return "
  • [label]
    • " //hardcoding is no - -GLOBAL_LIST_INIT(disposalpipeID2State, list( - "pipe-s", - "pipe-c", - "pipe-j1", - "pipe-j2", - "pipe-y", - "pipe-t", - "disposal", - "outlet", - "intake", - "pipe-j1s", - "pipe-j2s")) -======= ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435) - /datum/pipe_info/disposal categoryId = CATEGORY_DISPOSALS icon = 'icons/obj/atmospherics/pipes/disposal.dmi' @@ -133,18 +108,11 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( icon_state = initial(path.icon_state) if(ispath(path, /obj/structure/disposalpipe)) icon_state = "con[icon_state]" - -<<<<<<< HEAD -/datum/pipe_info/disposal/Render(dispenser,label) - return "
  • [label]
    • " //avoid hardcoding. -======= dirtype = dt /datum/pipe_info/disposal/Params() return "dmake=[id]&type=[dirtype]" ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435) - /obj/item/pipe_dispenser name = "Rapid Piping Device (RPD)" @@ -226,19 +194,6 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( dat += "Category:" var/icon/preview=null @@ -329,13 +282,8 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ↕ - ↔ -======= ↕ ↔ ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "} @@ -361,16 +309,6 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ↕ - ↔ -
    - ╝ - ╚ -
    - ╗ - ╔ -======= ↕ ↔
    @@ -379,7 +317,6 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list(
    ╗ ╔ ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "} if(PIPE_TRINARY) // Manifold @@ -399,19 +336,11 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ╦ - ╣ -
    - ╩ - ╠ -======= ╦ ╣
    ╩ ╠ ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "} if(PIPE_TRIN_M) // Mirrored ones @@ -441,19 +370,6 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ╦ - ╣ -
    - ╩ - ╠ -
    - ╦ - ╣ -
    - ╩ - ╠ -======= ╦ ╣
    @@ -465,7 +381,6 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list(
    ╩ ╠ ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "} if(PIPE_UNARY) // Stuff with four directions - includes pumps etc. @@ -484,17 +399,10 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ↑ - → - ↓ - ← -======= ↑ → ↓ ← ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "} if(PIPE_ONEDIR) // Single icon_state (eg 4-way manifolds) @@ -507,11 +415,7 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list( else dirsel+={"

    -<<<<<<< HEAD - ↕ -======= ↕ ->>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)

    "}