diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index c0eff33f7e..74fdf780fb 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -419,9 +419,9 @@ desc = "Anti-security propaganda. Features a human NanoTrasen security officer being shot in the head, with the words 'Scum' and a short inciteful manifesto. Used to anger security." icon_state = "poster46" -/obj/structure/sign/poster/contraband/scum - name = "Security are Scum" - desc = "Anti-security propaganda. Features a human NanoTrasen security officer being shot in the head, with the words 'Scum' and a short inciteful manifesto. Used to anger security." +/obj/structure/sign/poster/contraband/snydicate_logo + name = "Syndicate" + desc = "The infamous syndicate 'S', but there's a snake at the end of it!" icon_state = "poster47" /obj/structure/sign/poster/official diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 156b4c87cc..a3bb9fa5d8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -34,10 +34,10 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ )), \ //END OF CIT CHANGES new/datum/stack_recipe_list("fancy sofas", list( \ - new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/corp_sofa, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (left)", /obj/structure/chair/corp_sofa/left, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (right)", /obj/structure/chair/corp_sofa/right, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/corp_sofa/corner, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/corp, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, one_per_turf = TRUE, on_floor = TRUE), \ )), \ null, \ new/datum/stack_recipe_list("office chairs", list( \ @@ -105,18 +105,18 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \ null, \ new /datum/stack_recipe_list("chess pieces", list( \ - new /datum/stack_recipe("White Pawn", /obj/structure/chess/WhitePawn, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("White Rook", /obj/structure/chess/WhiteRook, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("White Knight", /obj/structure/chess/WhiteKnight, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("White Bishop", /obj/structure/chess/WhiteBishop, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("White Queen", /obj/structure/chess/WhiteQueen, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("White King", /obj/structure/chess/WhiteKing, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black Pawn", /obj/structure/chess/BlackPawn, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black Rook", /obj/structure/chess/BlackRook, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black Knight", /obj/structure/chess/BlackKnight, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black Bishop", /obj/structure/chess/BlackBishop, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black Queen", /obj/structure/chess/BlackQueen, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("Black King", /obj/structure/chess/BlackKing, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White Pawn", /obj/structure/chess/whitepawn, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White Rook", /obj/structure/chess/whiterook, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White Knight", /obj/structure/chess/whiteknight, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White Bishop", /obj/structure/chess/whitebishop, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White Queen", /obj/structure/chess/whitequeen, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("White King", /obj/structure/chess/whiteking, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black Pawn", /obj/structure/chess/blackpawn, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black Rook", /obj/structure/chess/blackrook, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black Knight", /obj/structure/chess/blackknight, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black Bishop", /obj/structure/chess/blackbishop, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black Queen", /obj/structure/chess/blackqueen, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("Black King", /obj/structure/chess/blackking, 2, time = 10, one_per_turf = 1, on_floor = 1), \ )), \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index f419cbd23a..39fa7affa6 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -582,40 +582,3 @@ . = ..() if(has_gravity()) playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE) - -/obj/structure/chair/sofa - name = "old ratty sofa" - icon_state = "sofamiddle" - icon = 'icons/obj/sofa.dmi' - buildstackamount = 1 - var/mutable_appearance/armrest - -/obj/structure/chair/sofa/Initialize() - armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER) - return ..() - -/obj/structure/chair/sofa/post_buckle_mob(mob/living/M) - . = ..() - update_armrest() - -/obj/structure/chair/sofa/proc/update_armrest() - if(has_buckled_mobs()) - add_overlay(armrest) - else - cut_overlay(armrest) - -/obj/structure/chair/sofa/post_unbuckle_mob() - . = ..() - update_armrest() - -/obj/structure/chair/sofa/left - icon_state = "sofaend_left" - -/obj/structure/chair/sofa/right - icon_state = "sofaend_right" - -/obj/structure/chair/sofa/corner - icon_state = "sofacorner" - -/obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob. - return diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm index e913bf6ae5..2f46c074ef 100644 --- a/code/game/objects/structures/beds_chairs/sofa.dm +++ b/code/game/objects/structures/beds_chairs/sofa.dm @@ -1,39 +1,53 @@ -// Credit for the sprites goes to CEV Eris. The sprites were taken from Hyper Station and modified to fit with armrests which were also added. - -/obj/structure/chair/corp_sofa - name = "sofa" - desc = "Soft, cushy and cozy. These sofas reek of bland faceless corporatism, but they aren't old and ratty at least." - icon_state = "corp_sofamiddle" +/obj/structure/chair/sofa + name = "old ratty sofa" + icon_state = "sofamiddle" icon = 'icons/obj/sofa.dmi' buildstackamount = 1 var/mutable_appearance/armrest -/obj/structure/chair/corp_sofa/Initialize() +/obj/structure/chair/sofa/Initialize() armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER) return ..() -/obj/structure/chair/corp_sofa/post_buckle_mob(mob/living/M) +/obj/structure/chair/sofa/post_buckle_mob(mob/living/M) . = ..() update_armrest() -/obj/structure/chair/corp_sofa/proc/update_armrest() +/obj/structure/chair/sofa/proc/update_armrest() if(has_buckled_mobs()) add_overlay(armrest) else cut_overlay(armrest) -/obj/structure/chair/corp_sofa/post_unbuckle_mob() +/obj/structure/chair/sofa/post_unbuckle_mob() . = ..() update_armrest() -/obj/structure/chair/corp_sofa/left +/obj/structure/chair/sofa/left + icon_state = "sofaend_left" + +/obj/structure/chair/sofa/right + icon_state = "sofaend_right" + +/obj/structure/chair/sofa/corner + icon_state = "sofacorner" + +/obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob. + return + +// Credit for the sprites goes to CEV Eris. The sprites were taken from Hyper Station and modified to fit with armrests which were also added. + +/obj/structure/chair/sofa/corp + name = "sofa" + desc = "Soft, cushy and cozy. These sofas reek of bland faceless corporatism, but they aren't old and ratty at least." + icon_state = "corp_sofamiddle" + icon = 'icons/obj/sofa.dmi' + +/obj/structure/chair/sofa/corp/left icon_state = "corp_sofaend_left" -/obj/structure/chair/corp_sofa/right +/obj/structure/chair/sofa/corp/right icon_state = "corp_sofaend_right" -/obj/structure/chair/corp_sofa/corner +/obj/structure/chair/sofa/corp/corner icon_state = "corp_sofacorner" - -/obj/structure/chair/corp_sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob. - return diff --git a/code/game/objects/structures/chess.dm b/code/game/objects/structures/chess.dm index 7bebe6b55c..8254405fee 100644 --- a/code/game/objects/structures/chess.dm +++ b/code/game/objects/structures/chess.dm @@ -15,62 +15,62 @@ qdel(src) return TRUE -/obj/structure/chess/WhitePawn +/obj/structure/chess/whitepawn name = "\improper White Pawn" desc = "A white pawn chess piece. Get accused of cheating when executing a sick En Passant." icon_state = "white_pawn" -/obj/structure/chess/WhiteRook +/obj/structure/chess/whiterook name = "\improper White Rook" desc = "A white rook chess piece. Also known as a castle. Can move any number of tiles in a straight line. It has a special move called castling." icon_state = "white_rook" -/obj/structure/chess/WhiteKnight +/obj/structure/chess/whiteknight name = "\improper White Knight" desc = "A white knight chess piece. Hah. It can hop over other pieces, moving in L shapes." icon_state = "white_knight" -/obj/structure/chess/WhiteBishop +/obj/structure/chess/whitebishop name = "\improper White Bishop" desc = "A white bishop chess piece. It can move any number of tiles in a diagonal line." icon_state = "white_bishop" -/obj/structure/chess/WhiteQueen +/obj/structure/chess/whitequeen name = "\improper White Queen" desc = "A white queen chess piece. It can move any number of tiles in diagonal and straight lines." icon_state = "white_queen" -/obj/structure/chess/WhiteKing +/obj/structure/chess/whiteking name = "\improper White King" desc = "A white king chess piece. It can move any tile in one direction." icon_state = "white_king" -/obj/structure/chess/BlackPawn +/obj/structure/chess/blackpawn name = "\improper Black Pawn" desc = "A black pawn chess piece. Get accused of cheating when executing a sick En Passant." icon_state = "black_pawn" -/obj/structure/chess/BlackRook +/obj/structure/chess/blackrook name = "\improper Black Rook" desc = "A black rook chess piece. Also known as a castle. Can move any number of tiles in a straight line. It has a special move called castling." icon_state = "black_rook" -/obj/structure/chess/BlackKnight +/obj/structure/chess/blackknight name = "\improper Black Knight" desc = "A black knight chess piece. It can hop over other pieces, moving in L shapes." icon_state = "black_knight" -/obj/structure/chess/BlackBishop +/obj/structure/chess/blackbishop name = "\improper Black Bishop" desc = "A black bishop chess piece. It can move any number of tiles in a diagonal line." icon_state = "black_bishop" -/obj/structure/chess/BlackQueen +/obj/structure/chess/blackqueen name = "\improper Black Queen" desc = "A black queen chess piece. It can move any number of tiles in diagonal and straight lines." icon_state = "black_queen" -/obj/structure/chess/BlackKing +/obj/structure/chess/blackking name = "\improper Black King" desc = "A black king chess piece. It can move one tile in any direction." icon_state = "black_king" \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index ab2e7c17be..bd86255377 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -634,14 +634,14 @@ layer = WALL_OBJ_LAYER density = TRUE open = FALSE - opacity = 1 + opacity = TRUE else icon_state = "open" layer = SIGN_LAYER density = FALSE open = TRUE - opacity = 0 + opacity = FALSE /obj/structure/curtain/attackby(obj/item/W, mob/user) if (istype(W, /obj/item/toy/crayon)) diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index 244ae12a7e..1d6510981b 100644 Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ