"
+ .["item"] = null
+
+/obj/machinery/gear_painter/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ if(inserted)
+ switch(action)
+ if("switch_modes")
+ matrix_mode = text2num(params["mode"])
+ return TRUE
+ if("choose_color")
+ var/chosen_color = input(usr, "Choose a color: ", "Colormate color picking", activecolor) as color|null
+ if(chosen_color)
+ activecolor = chosen_color
+ return TRUE
+ if("paint")
+ if(!check_valid_color(activecolor, usr))
+ return TRUE
+ inserted.add_atom_colour(activecolor, FIXED_COLOUR_PRIORITY)
+ playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+ temp = "Painted Successfully!"
+ return TRUE
+ if("drop")
+ temp = "Ejected \the [inserted]!"
+ drop_item()
+ return TRUE
+ if("clear")
+ inserted.remove_atom_colour(FIXED_COLOUR_PRIORITY)
+ playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+ temp = "Cleared Successfully!"
+ return TRUE
+ if("set_matrix_color")
+ color_matrix_last[params["color"]] = params["value"]
+ return TRUE
+ if("matrix_paint")
+ var/list/cm = rgb_construct_color_matrix(
+ text2num(color_matrix_last[1]),
+ text2num(color_matrix_last[2]),
+ text2num(color_matrix_last[3]),
+ text2num(color_matrix_last[4]),
+ text2num(color_matrix_last[5]),
+ text2num(color_matrix_last[6]),
+ text2num(color_matrix_last[7]),
+ text2num(color_matrix_last[8]),
+ text2num(color_matrix_last[9]),
+ text2num(color_matrix_last[10]),
+ text2num(color_matrix_last[11]),
+ text2num(color_matrix_last[12])
+ )
+ if(!check_valid_color(cm, usr))
+ return TRUE
+ inserted.add_atom_colour(cm, FIXED_COLOUR_PRIORITY)
+ playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+ temp = "Matrix Painted Successfully!"
+ return TRUE
+
+/// Produces the preview image of the item, used in the UI, the way the color is not stacking is a sin.
+/obj/machinery/gear_painter/proc/build_preview()
+ if(inserted) //sanity
+ if(matrix_mode)
+ var/list/cm = rgb_construct_color_matrix(
+ text2num(color_matrix_last[1]),
+ text2num(color_matrix_last[2]),
+ text2num(color_matrix_last[3]),
+ text2num(color_matrix_last[4]),
+ text2num(color_matrix_last[5]),
+ text2num(color_matrix_last[6]),
+ text2num(color_matrix_last[7]),
+ text2num(color_matrix_last[8]),
+ text2num(color_matrix_last[9]),
+ text2num(color_matrix_last[10]),
+ text2num(color_matrix_last[11]),
+ text2num(color_matrix_last[12])
+ )
+ if(!check_valid_color(cm, usr))
+ temp = "Failed to generate preview: Invalid color!"
+ return getFlatIcon(inserted, defdir=SOUTH, no_anim=TRUE)
+
+ var/cur_color = inserted.color
+ inserted.color = null
+ inserted.color = cm
+ var/icon/preview = getFlatIcon(inserted, defdir=SOUTH, no_anim=TRUE)
+ inserted.color = cur_color
+
+ . = preview
+
else
- // POGGERS
-#define MATRIX_FIELD(field, default) " "
- dat += " ")
+ temp = "[cm] is far too dark (min lightness [minimum_normal_lightness]!"
return FALSE
return TRUE
else // matrix
@@ -245,6 +274,6 @@
COLORTEST("FFFFFF", cm)
#undef COLORTEST
if(passed < minimum_matrix_tests)
- to_chat(user, "[english_list(color)] is not allowed (pased [passed] out of 4, minimum [minimum_matrix_tests], minimum lightness [minimum_matrix_lightness]).")
+ temp = "[english_list(color)] is not allowed (passed [passed] out of 4, minimum [minimum_matrix_tests], minimum lightness [minimum_matrix_lightness])."
return FALSE
return TRUE
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index a2d32e0d4f..abca9db109 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -17,12 +17,8 @@
/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
-
power_change()
-/obj/machinery/computer/Destroy()
- . = ..()
-
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
return FALSE
@@ -119,6 +115,9 @@
A.circuit = circuit
// Circuit removal code is handled in /obj/machinery/Exited()
circuit.forceMove(A)
+ // no it's not 4head the circuit's in nullspace which means this won't be called!!
+ circuit = null
+ component_parts -= circuit
A.set_anchored(TRUE)
if(stat & BROKEN)
if(user)
diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm
index cd6ff2359c..1027ab1815 100644
--- a/code/game/machinery/computer/arcade/minesweeper.dm
+++ b/code/game/machinery/computer/arcade/minesweeper.dm
@@ -176,15 +176,6 @@
table[y1][x1] -= 10
else if(table[y1][x1] < 0) //If flagged, remove the flag
table[y1][x1] += 10
- if(href_list["same_board"]) //Reset the board... kinda
- if(game_status != MINESWEEPER_GAME_PLAYING)
- mine_sound = TRUE
- game_status = MINESWEEPER_GAME_PLAYING
- if(table[y1][x1] >= 10) //If revealed, become unrevealed!
- if(mine_sound)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3)
- mine_sound = FALSE
- table[y1][x1] -= 10
if(table[y1][x1] > 10 && !reset_board)
safe_squares_revealed += 1
var/y2 = y1
@@ -274,10 +265,10 @@
prizevend(user, dope_prizes)
if(game_status == MINESWEEPER_GAME_WON)
- web += "[(rows < 10 || columns < 10) ? "You won, but your board was too small! Pick a bigger board next time!" : "Congratulations, you have won!"] Want to play again? Easy (9x9 board, 10 mines) Intermediate (16x16 board, 40 mines) Hard (16x30 board, 99 mines) Custom Play on the same board Return to Main Menu "
+ web += "[(rows < 10 || columns < 10) ? "You won, but your board was too small! Pick a bigger board next time!" : "Congratulations, you have won!"] Want to play again? Easy (9x9 board, 10 mines) Intermediate (16x16 board, 40 mines) Hard (16x30 board, 99 mines) Custom Return to Main Menu "
if(game_status == MINESWEEPER_GAME_LOST)
- web += "You have lost! Try again? Easy (9x9 board, 10 mines) Intermediate (16x16 board, 40 mines) Hard (16x30 board, 99 mines) Custom Play on the same board Return to Main Menu "
+ web += "You have lost! Try again? Easy (9x9 board, 10 mines) Intermediate (16x16 board, 40 mines) Hard (16x30 board, 99 mines) Custom Return to Main Menu "
if(game_status == MINESWEEPER_GAME_PLAYING)
web += "Return to Main Menu "
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 47343ea58f..c18d146e90 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -151,6 +151,7 @@
new_computer.RefreshParts()
new_computer.on_construction()
+ new_computer.circuit.moveToNullspace()
qdel(src)
return
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 19da4f75d8..bf690398a4 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -200,6 +200,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
return b["totaldam"] - a["totaldam"]
/datum/crewmonitor/ui_act(action,params)
+ . = ..()
+ if(.)
+ return
var/mob/living/silicon/ai/AI = usr
if(!istype(AI))
return
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 9876206724..808dc4877b 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -86,6 +86,9 @@
.["machine"]["chang_freq_value"] = change_freq_value
/obj/machinery/telecomms/ui_act(action, params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return
if(!canInteract(usr))
if(ui)
ui.close() //haha no.
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 3ef4cb0307..58a3eb312b 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -269,6 +269,10 @@ GLOBAL_LIST_INIT(channel_tokens, list(
. = ..()
AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES)
+/obj/item/radio/headset/silicon/pai/emp_act(severity)
+ . = ..()
+ return EMP_PROTECT_SELF
+
/obj/item/radio/headset/silicon/ai
name = "\proper Integrated Subspace Transceiver "
keyslot2 = new /obj/item/encryptionkey/ai
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index bbc493672f..53b0860def 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -17,6 +17,11 @@
/obj/item/dice/d100
)
+/obj/item/storage/dice/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.can_hold = single_path_typecache_immutable(/obj/item/dice)
+
/obj/item/storage/dice/PopulateContents()
new /obj/item/dice/d4(src)
new /obj/item/dice/d6(src)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 6ab12b7e39..d1450c2685 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -535,13 +535,13 @@
oneuse = FALSE
remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?")
-/obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
+/*/obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
name = "bowyery sandstone slab" // this is an actual word
desc = "A sandstone slab with inscriptions describing the Ash Walkers of Lavaland's bowyery."
crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet)
icon_state = "stone_tablet"
oneuse = FALSE
- remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...")
+ remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...")*/
/obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book
name = "Under The Oven"
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 59464d25a7..683232b540 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -238,72 +238,73 @@
return
return ..()
-/obj/item/toy/plush/proc/love(obj/item/toy/plush/Kisser, mob/living/user) //~<3
- var/chance = 100 //to steal a kiss, surely there's a 100% chance no-one would reject a plush such as I?
- var/concern = 20 //perhaps something might cloud true love with doubt
- var/loyalty = 30 //why should another get between us?
- var/duty = 50 //conquering another's is what I live for
+/obj/item/toy/plush/proc/love(obj/item/toy/plush/Kisser, mob/living/user) //~<3
+ var/chance = 100 //to steal a kiss, surely there's a 100% chance no-one would reject a plush such as I?
+ var/concern = 20 //perhaps something might cloud true love with doubt
+ var/loyalty = 30 //why should another get between us?
+ var/duty = 50 //conquering another's is what I live for
//we are not catholic
if(young == TRUE || Kisser.young == TRUE)
- user.show_message("[src] plays tag with [Kisser].", MSG_VISUAL,
- "They're happy.", 0)
+ user.show_message(span_notice("[src] plays tag with [Kisser]."), MSG_VISUAL,
+ span_notice("They're happy."), NONE)
Kisser.cheer_up()
cheer_up()
//never again
else if(Kisser in scorned)
//message, visible, alternate message, neither visible nor audible
- user.show_message("[src] rejects the advances of [Kisser]!", MSG_VISUAL,
- "That didn't feel like it worked.", 0)
+ user.show_message(span_notice("[src] rejects the advances of [Kisser]!"), MSG_VISUAL,
+ span_notice("That didn't feel like it worked."), NONE)
else if(src in Kisser.scorned)
- user.show_message("[Kisser] realises who [src] is and turns away.", MSG_VISUAL,
- "That didn't feel like it worked.", 0)
+ user.show_message(span_notice("[Kisser] realises who [src] is and turns away."), MSG_VISUAL,
+ span_notice("That didn't feel like it worked."), NONE)
//first comes love
- else if(Kisser.lover != src && Kisser.partner != src) //cannot be lovers or married
- if(Kisser.lover) //if the initiator has a lover
- Kisser.lover.heartbreak(Kisser) //the old lover can get over the kiss-and-run whilst the kisser has some fun
- chance -= concern //one heart already broken, what does another mean?
- if(lover) //if the recipient has a lover
- chance -= loyalty //mustn't... but those lips
- if(partner) //if the recipient has a partner
- chance -= duty //do we mate for life?
+ else if(Kisser.lover != src && Kisser.partner != src) //cannot be lovers or married
+ if(Kisser.lover) //if the initiator has a lover
+ Kisser.lover.heartbreak(Kisser) //the old lover can get over the kiss-and-run whilst the kisser has some fun
+ chance -= concern //one heart already broken, what does another mean?
+ if(lover) //if the recipient has a lover
+ chance -= loyalty //mustn't... but those lips
+ if(partner) //if the recipient has a partner
+ chance -= duty //do we mate for life?
- if(prob(chance)) //did we bag a date?
- user.visible_message("[user] makes [Kisser] kiss [src]!",
- "You make [Kisser] kiss [src]!")
- if(lover) //who cares for the past, we live in the present
+ if(prob(chance)) //did we bag a date?
+ user.visible_message(span_notice("[user] makes [Kisser] kiss [src]!"),
+ span_notice("You make [Kisser] kiss [src]!"))
+ if(lover) //who cares for the past, we live in the present
lover.heartbreak(src)
new_lover(Kisser)
Kisser.new_lover(src)
else
- user.show_message("[src] rejects the advances of [Kisser], maybe next time?", MSG_VISUAL,
- "That didn't feel like it worked, this time.", 0)
+ user.show_message(span_notice("[src] rejects the advances of [Kisser], maybe next time?"), MSG_VISUAL,
+ span_notice("That didn't feel like it worked, this time."), NONE)
//then comes marriage
- else if(Kisser.lover == src && Kisser.partner != src) //need to be lovers (assumes loving is a two way street) but not married (also assumes similar)
- user.visible_message("[user] pronounces [Kisser] and [src] married! D'aw.",
- "You pronounce [Kisser] and [src] married!")
+ else if(Kisser.lover == src && Kisser.partner != src) //need to be lovers (assumes loving is a two way street) but not married (also assumes similar)
+ user.visible_message(span_notice("[user] pronounces [Kisser] and [src] married! D'aw."),
+ span_notice("You pronounce [Kisser] and [src] married!"))
new_partner(Kisser)
Kisser.new_partner(src)
//then comes a baby in a baby's carriage, or an adoption in an adoption's orphanage
- else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop
- user.visible_message("[user] is going to break [Kisser] and [src] by bashing them like that.",
- "[Kisser] passionately embraces [src] in your hands. Look away you perv!")
+ else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop
+ user.visible_message(span_notice("[user] is going to break [Kisser] and [src] by bashing them like that."),
+ span_notice("[Kisser] passionately embraces [src] in your hands. Look away you perv!"))
+ user.client.give_award(/datum/award/achievement/misc/rule8, user)
if(plop(Kisser))
- user.visible_message("Something drops at the feet of [user].",
- "The miracle of oh god did that just come out of [src]?!")
+ user.visible_message(span_notice("Something drops at the feet of [user]."),
+ span_notice("The miracle of oh god did that just come out of [src]?!"))
//then comes protection, or abstinence if we are catholic
else if(Kisser.partner == src && plush_child)
- user.visible_message("[user] makes [Kisser] nuzzle [src]!",
- "You make [Kisser] nuzzle [src]!")
+ user.visible_message(span_notice("[user] makes [Kisser] nuzzle [src]!"),
+ span_notice("You make [Kisser] nuzzle [src]!"))
//then oh fuck something unexpected happened
else
- user.show_message("[Kisser] and [src] don't know what to do with one another.", 0)
+ user.show_message(span_warning("[Kisser] and [src] don't know what to do with one another."), NONE)
/obj/item/toy/plush/proc/heartbreak(obj/item/toy/plush/Brutus)
if(lover != Brutus)
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 74efe3a196..f1691e5eb9 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -78,7 +78,7 @@
animate(effect, alpha = 0, pixel_x = px * 1.5, pixel_y = py * 1.5, time = 3, flags = ANIMATION_PARALLEL | ANIMATION_RELATIVE)
/obj/item/shield/proc/bash_target(mob/living/user, mob/living/target, bashdir, harmful)
- if(!(target.status_flags & CANKNOCKDOWN) || HAS_TRAIT(src, TRAIT_STUNIMMUNE)) // should probably add stun absorption check at some point I guess..
+ if(!(HAS_TRAIT(target, CANKNOCKDOWN)) || HAS_TRAIT(target, TRAIT_STUNIMMUNE)) // should probably add stun absorption check at some point I guess..
// unified stun absorption system when lol
target.visible_message("[user] slams [target] with [src], but [target] doesn't falter!", "[user] slams you with [src], but it barely fazes you!")
return FALSE
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 9c3d776b56..e30ec783bf 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -312,7 +312,7 @@
/obj/item/storage/belt/mining/primitive/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 5
+ STR.max_items = 8
/obj/item/storage/belt/soulstone
name = "soul stone belt"
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 7a067257cb..56cf50993b 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -79,6 +79,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
name = "mechanical toolbox"
icon_state = "blue"
item_state = "toolbox_blue"
+ /// If FALSE, someone with a ensouled soulstone can sacrifice a spirit to change the sprite of this toolbox.
+ var/has_soul = FALSE
/obj/item/storage/toolbox/mechanical/PopulateContents()
new /obj/item/screwdriver(src)
@@ -93,6 +95,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
icon_state = "toolbox_blue_old"
has_latches = FALSE
can_rubberify = FALSE
+ has_soul = TRUE
/obj/item/storage/toolbox/mechanical/old/heirloom
name = "old, robust toolbox" //this will be named "X family toolbox"
@@ -126,7 +129,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
/obj/item/storage/toolbox/mechanical/old/clean/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
calc_damage()
..()
-
+
/obj/item/storage/toolbox/mechanical/old/clean/PopulateContents()
new /obj/item/screwdriver(src)
new /obj/item/wrench(src)
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index f481cab91f..93f8915f95 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -41,6 +41,13 @@
/obj/item/crowbar/brass/family
toolspeed = 1
+/obj/item/crowbar/ashwalker
+ name = "bone crowbar"
+ desc = "A rudimentary crowbar made of bones."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "crowbar_bone"
+ toolspeed = 0.75
+
/obj/item/crowbar/bronze
name = "bronze plated crowbar"
desc = "A bronze plated crowbar."
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 920afb8d14..9f393a7fcb 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -93,6 +93,14 @@
/obj/item/screwdriver/brass/family
toolspeed = 1
+/obj/item/screwdriver/ashwalker
+ name = "bone screwdriver"
+ desc = "A rudimentary screwdriver made of carved bones."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "screwdriver_bone"
+ toolspeed = 0.75
+ random_color = FALSE
+
/obj/item/screwdriver/bronze
name = "bronze screwdriver"
desc = "A screwdriver plated with bronze."
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 98889485b6..13c3c100b5 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -385,6 +385,16 @@
icon_state = "clockwelder"
item_state = "brasswelder"
+/obj/item/weldingtool/experimental/ashwalker
+ name = "necropolis welding torch"
+ desc = "A mysterious welding tool with its origins in the depths of the necropolis. A mysterious force keeps replenishing its fuel."
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ refueling_interval = 5
+ toolspeed = 0.75
+ max_fuel = 20
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "ashwelder"
+
/obj/item/weldingtool/abductor
name = "alien welding tool"
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 51bb046290..cbca26e63c 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -90,6 +90,14 @@
/obj/item/wirecutters/brass/family
toolspeed = 1
+/obj/item/wirecutters/ashwalker
+ name = "bone wirecutters"
+ desc = "Rudimentary wirecutters made out of sharpened bones and sinew."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "cutters_bone"
+ toolspeed = 0.75
+ random_color = FALSE
+
/obj/item/wirecutters/bronze
name = "bronze plated wirecutters"
desc = "A pair of wirecutters plated with bronze."
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 6199e7fc76..9a0db3b92b 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -44,6 +44,13 @@
/obj/item/wrench/brass/family
toolspeed = 1
+/obj/item/wrench/ashwalker
+ name = "bone wrench"
+ desc = "A shoddy wrench made out of bent bones and sinew."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "wrench_bone"
+ toolspeed = 0.75
+
/obj/item/wrench/bronze
name = "bronze plated wrench"
desc = "A bronze plated wrench."
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 78a5c9ece9..15fd102878 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -22,7 +22,7 @@
//returns the damage value of the attack after processing the obj's various armor protections
/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
- if(damage_flag == MELEE && damage_amount < damage_deflection)
+ if(damage_flag == "melee" && damage_amount < damage_deflection) // TODO: Refactor armor datums and types entirely jfc
return 0
switch(damage_type)
if(BRUTE)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index f5746d6ae7..40af75002f 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -66,12 +66,6 @@
//Ash walkers on birth understand how to make bone bows, bone arrows and ashen arrows
- new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_arrow)
- new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_bow)
- new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/ashen_arrow)
- new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/quiver)
- new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bow_tablet)
-
if(ishuman(new_spawn))
var/mob/living/carbon/human/H = new_spawn
H.underwear = "Nude"
@@ -634,9 +628,9 @@
log_game("[key_name(user)] has successfully pried open [src] and disabled a space pirate spawner.")
W.play_tool_sound(src)
playsound(src.loc, 'modular_citadel/sound/voice/scream_skeleton.ogg', 50, 1, 4, 1.2)
- if(rank == "Captain")
+ if(rank == "Captain")
new /obj/effect/mob_spawn/human/pirate/corpse/captain(get_turf(src))
- else
+ else
new /obj/effect/mob_spawn/human/pirate/corpse(get_turf(src))
qdel(src)
else
diff --git a/code/game/world.dm b/code/game/world.dm
index 14a85bb619..44e9fe9e14 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -2,8 +2,6 @@
GLOBAL_VAR(restart_counter)
-GLOBAL_VAR_INIT(tgs_initialized, FALSE)
-
GLOBAL_VAR(topic_status_lastcache)
GLOBAL_LIST(topic_status_cache)
@@ -76,7 +74,6 @@ GLOBAL_LIST(topic_status_cache)
/world/proc/InitTgs()
TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED)
GLOB.revdata.load_tgs_info()
- GLOB.tgs_initialized = TRUE
/world/proc/HandleTestRun()
//trigger things to run the whole process
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
index 023be4b3e7..15ac8a6cb6 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
@@ -226,16 +226,16 @@
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shed_human_form)
if(!ishuman(user))
return
- var/mob/living/carbon/human/H = user
- H.physiology.brute_mod *= 0.5
- H.physiology.burn_mod *= 0.5
- var/datum/antagonist/heretic/heretic = user.mind.has_antag_datum(/datum/antagonist/heretic)
- var/datum/eldritch_knowledge/flesh_grasp/ghoul1 = heretic.get_knowledge(/datum/eldritch_knowledge/flesh_grasp)
- ghoul1.ghoul_amt *= 3
- var/datum/eldritch_knowledge/flesh_ghoul/ghoul2 = heretic.get_knowledge(/datum/eldritch_knowledge/flesh_ghoul)
- ghoul2.max_amt *= 3
+ var/mob/living/carbon/human/lord_of_arms = user
+ lord_of_arms.physiology.brute_mod *= 0.5
+ lord_of_arms.physiology.burn_mod *= 0.5
+ lord_of_arms.client?.give_award(/datum/award/achievement/misc/flesh_ascension, lord_of_arms)
+ var/datum/antagonist/heretic/heretic_datum = user.mind.has_antag_datum(/datum/antagonist/heretic)
+ var/datum/eldritch_knowledge/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/eldritch_knowledge/flesh_grasp)
+ grasp_ghoul.ghoul_amt *= 3
+ var/datum/eldritch_knowledge/flesh_ghoul/better_ghoul = heretic_datum.get_knowledge(/datum/eldritch_knowledge/flesh_ghoul)
+ better_ghoul.max_amt *= 3
- return ..()
/datum/eldritch_knowledge/flesh_blade_upgrade_2
name = "Remembrance"
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
index 509c35261e..733b2725cb 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
@@ -181,13 +181,13 @@
var/mob/living/carbon/human/H = user
H.physiology.brute_mod *= 0.5
H.physiology.burn_mod *= 0.5
+ H.client?.give_award(/datum/award/achievement/misc/rust_ascension, H)
priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
new /datum/rust_spread(loc)
var/datum/antagonist/heretic/ascension = H.mind.has_antag_datum(/datum/antagonist/heretic)
ascension.ascended = TRUE
return ..()
-
/datum/eldritch_knowledge/final/rust_final/on_life(mob/user)
. = ..()
if(!finished)
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
index 97b5af0f4d..dcbc01b046 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
@@ -183,14 +183,14 @@
var/datum/weather/void_storm/storm
/datum/eldritch_knowledge/final/void_final/on_finished_recipe(mob/living/user, list/atoms, loc)
- var/mob/living/carbon/human/H = user
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch)
- H.physiology.brute_mod *= 0.5
- H.physiology.burn_mod *= 0.5
- ADD_TRAIT(H, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
- priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# The nobleman of void [H.real_name] has arrived, step along the Waltz that ends worlds! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
-
- sound_loop = new(list(user),TRUE,TRUE)
+ var/mob/living/carbon/human/waltzing = user
+ waltzing.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch)
+ waltzing.physiology.brute_mod *= 0.5
+ waltzing.physiology.burn_mod *= 0.5
+ ADD_TRAIT(waltzing, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
+ waltzing.client?.give_award(/datum/award/achievement/misc/void_ascension, waltzing)
+ priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# The nobleman of void [waltzing.real_name] has arrived, step along the Waltz that ends worlds! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
+ sound_loop = new(user, TRUE, TRUE)
return ..()
/datum/eldritch_knowledge/final/void_final/on_death()
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index d4d70cd053..fe9770e64a 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -50,6 +50,14 @@
A.death()
return ..()
+/obj/item/soulstone/proc/hot_potato(mob/living/user)
+ to_chat(user, span_userdanger("Holy magics residing in \the [src] burn your hand!"))
+ var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
+ affecting.receive_damage( 0, 10 ) // 10 burn damage
+ user.emote("scream")
+ user.update_damage_overlays()
+ user.dropItemToGround(src)
+
//////////////////////////////Capturing////////////////////////////////////////////////////////
/obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
@@ -94,6 +102,35 @@
to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
was_used()
+/obj/item/soulstone/pre_attack(atom/A, mob/living/user, params)
+ var/mob/living/simple_animal/hostile/construct/shade/occupant = (locate() in src)
+ var/obj/item/storage/toolbox/mechanical/target_toolbox = A
+ if(!occupant || !istype(target_toolbox) || target_toolbox.has_soul)
+ return ..()
+
+ if(iscultist(user))
+ hot_potato(user)
+ return
+ if(!iscultist(user, TRUE) && !iswizard(user) && !usability)
+ user.Unconscious(10 SECONDS)
+ to_chat(user, span_userdanger("Your body is wracked with debilitating pain!"))
+ return
+
+ user.visible_message("[user] holds [src] above [user.p_their()] head and forces it into [target_toolbox] with a flash of light!", \
+ span_notice("You hold [src] above your head briefly, then force it into [target_toolbox], transferring the [occupant]'s soul!"), ignored_mobs = occupant)
+ to_chat(occupant, span_userdanger("[user] holds you up briefly, then forces you into [target_toolbox]!"))
+ to_chat(occupant, span_deadsay("Your eternal soul has been sacrificed to restore the soul of a toolbox. Them's the breaks!"))
+
+ occupant.client?.give_award(/datum/award/achievement/misc/toolbox_soul, occupant)
+ occupant.deathmessage = "shrieks out in unholy pain as [occupant.p_their()] soul is absorbed into [target_toolbox]!"
+ release_shades(user, TRUE)
+ occupant.death()
+
+ target_toolbox.name = "soulful toolbox"
+ target_toolbox.icon_state = "toolbox_blue_old"
+ target_toolbox.has_soul = TRUE
+ target_toolbox.has_latches = FALSE
+
///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
/obj/structure/constructshell
name = "empty shell"
diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm
index 221febbe14..94c7630bd9 100644
--- a/code/modules/asset_cache/asset_list.dm
+++ b/code/modules/asset_cache/asset_list.dm
@@ -11,6 +11,10 @@ GLOBAL_LIST_EMPTY(asset_datums)
/datum/asset
var/_abstract = /datum/asset
+ var/cached_url_mappings
+
+ /// Whether or not this asset should be loaded in the "early assets" SS
+ var/early = FALSE
/datum/asset/New()
GLOB.asset_datums[type] = src
@@ -19,6 +23,13 @@ GLOBAL_LIST_EMPTY(asset_datums)
/datum/asset/proc/get_url_mappings()
return list()
+/// Returns a cached tgui message of URL mappings
+/datum/asset/proc/get_serialized_url_mappings()
+ if (isnull(cached_url_mappings))
+ cached_url_mappings = TGUI_CREATE_MESSAGE("asset/mappings", get_url_mappings())
+
+ return cached_url_mappings
+
/datum/asset/proc/register()
return
@@ -169,6 +180,8 @@ GLOBAL_LIST_EMPTY(asset_datums)
I = icon(I, icon_state=icon_state, dir=dir, frame=frame, moving=moving)
if (!I || !length(icon_states(I))) // that direction or state doesn't exist
return
+ //any sprite modifications we want to do (aka, coloring a greyscaled asset)
+ I = ModifyInserted(I)
var/size_id = "[I.Width()]x[I.Height()]"
var/size = sizes[size_id]
@@ -185,6 +198,15 @@ GLOBAL_LIST_EMPTY(asset_datums)
sizes[size_id] = size = list(1, I, null)
sprites[sprite_name] = list(size_id, 0)
+/**
+ * A simple proc handing the Icon for you to modify before it gets turned into an asset.
+ *
+ * Arguments:
+ * * I: icon being turned into an asset
+ */
+/datum/asset/spritesheet/proc/ModifyInserted(icon/pre_asset)
+ return pre_asset
+
/datum/asset/spritesheet/proc/InsertAll(prefix, icon/I, list/directions)
if (length(prefix))
prefix = "[prefix]-"
@@ -217,6 +239,19 @@ GLOBAL_LIST_EMPTY(asset_datums)
var/size_id = sprite[SPR_SIZE]
return {"[name][size_id] [sprite_name]"}
+/**
+ * Returns the size class (ex design32x32) for a given sprite's icon
+ *
+ * Arguments:
+ * * sprite_name - The sprite to get the size of
+ */
+/datum/asset/spritesheet/proc/icon_size_id(sprite_name)
+ var/sprite = sprites[sprite_name]
+ if (!sprite)
+ return null
+ var/size_id = sprite[SPR_SIZE]
+ return "[name][size_id]"
+
#undef SPR_SIZE
#undef SPR_IDX
#undef SPRSZ_COUNT
@@ -224,6 +259,24 @@ GLOBAL_LIST_EMPTY(asset_datums)
#undef SPRSZ_STRIPPED
+/datum/asset/changelog_item
+ _abstract = /datum/asset/changelog_item
+ var/item_filename
+
+/datum/asset/changelog_item/New(date)
+ item_filename = sanitize_filename("[date].yml")
+ SSassets.transport.register_asset(item_filename, file("html/changelogs/archive/" + item_filename))
+
+/datum/asset/changelog_item/send(client)
+ if (!item_filename)
+ return
+ . = SSassets.transport.send_assets(client, item_filename)
+
+/datum/asset/changelog_item/get_url_mappings()
+ if (!item_filename)
+ return
+ . = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename))
+
/datum/asset/spritesheet/simple
_abstract = /datum/asset/spritesheet/simple
var/list/assets
@@ -315,3 +368,28 @@ GLOBAL_LIST_EMPTY(asset_datums)
/datum/asset/simple/namespaced/proc/get_htmlloader(filename)
return url2htmlloader(SSassets.transport.get_asset_url(filename, assets[filename]))
+/// A subtype to generate a JSON file from a list
+/datum/asset/json
+ _abstract = /datum/asset/json
+ /// The filename, will be suffixed with ".json"
+ var/name
+
+/datum/asset/json/send(client)
+ return SSassets.transport.send_assets(client, "data/[name].json")
+
+/datum/asset/json/get_url_mappings()
+ return list(
+ "[name].json" = SSassets.transport.get_asset_url("data/[name].json"),
+ )
+
+/datum/asset/json/register()
+ var/filename = "data/[name].json"
+ fdel(filename)
+ text2file(json_encode(generate()), filename)
+ SSassets.transport.register_asset(filename, fcopy_rsc(filename))
+ fdel(filename)
+
+/// Returns the data that will be JSON encoded
+/datum/asset/json/proc/generate()
+ SHOULD_CALL_PARENT(FALSE)
+ CRASH("generate() not implemented for [type]!")
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 15c6475033..868c5dafa3 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -235,7 +235,7 @@
. += "can-open"
if(connected_port)
. += "can-connector"
- var/pressure = air_contents.return_pressure()
+ var/pressure = air_contents?.return_pressure()
if(pressure >= 40 * ONE_ATMOSPHERE)
. += "can-o3"
else if(pressure >= 10 * ONE_ATMOSPHERE)
@@ -295,6 +295,7 @@
density = FALSE
playsound(src.loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
investigate_log("was destroyed.", INVESTIGATE_ATMOS)
+ update_icon_state()
if(holding)
holding.forceMove(T)
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index c973ceed26..42cd1dccea 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -211,11 +211,6 @@
unit_name = "arrow"
export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ash)
-/datum/export/weapon/bow_teaching
- cost = 500
- unit_name = "bowyery tablet"
- export_types = list(/obj/item/book/granter/crafting_recipe/bone_bow)
-
/datum/export/weapon/quiver
cost = 100
unit_name = "quiver"
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 1c9c21e0d7..c065c387c5 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -128,6 +128,9 @@
return data
/obj/machinery/computer/cargo/express/ui_act(action, params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return
switch(action)
if("LZCargo")
usingBeacon = FALSE
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
index eda36ea12f..30e9d487e0 100644
--- a/code/modules/clothing/gloves/tacklers.dm
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -67,6 +67,20 @@
resistance_flags = NONE
strip_mod = 1.2 // because apparently black gloves had this
+/obj/item/clothing/gloves/tackler/combat/goliath
+ name = "goliath gloves"
+ desc = "Rudimentary tackling gloves. The goliath hide makes it great for grappling with targets, while also being fireproof."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "goligloves"
+ item_state = "goligloves"
+
+ tackle_stam_cost = 25
+ base_knockdown = 1 SECONDS
+ tackle_range = 5
+ tackle_speed = 2
+ min_distance = 2
+ skill_mod = 1
+
/obj/item/clothing/gloves/tackler/combat/insulated
name = "guerrilla gloves"
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 35cb2fa1e5..10dbb9e2bf 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -427,25 +427,30 @@
desc = "Comfy and supposedly flammable."
icon_state = "flannel"
item_state = "flannel"
-
-/obj/item/clothing/suit/jacket/flannel/red
+/obj/item/clothing/suit/toggle/jacket/flannel/red
name = "red flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_red"
item_state = "flannel_red"
-
-/obj/item/clothing/suit/jacket/flannel/aqua
+ togglename = "buttons"
+/obj/item/clothing/suit/toggle/jacket/flannel/aqua
name = "aqua flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_aqua"
item_state = "flannel_aqua"
-
-/obj/item/clothing/suit/jacket/flannel/brown
+ togglename = "buttons"
+/obj/item/clothing/suit/toggle/jacket/flannel/brown
name = "brown flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_brown"
item_state = "flannel_brown"
-
+ togglename = "buttons"
+/obj/item/clothing/suit/toggle/jacket/whitehoodie
+ name = "soft hoodie"
+ desc = "A soft hoodie with a TailorCo brand on the tag."
+ icon_state = "white_hoodie"
+ item_state = "white_hoodie"
+ togglename = "zipper"
/obj/item/clothing/suit/jacket/purplehoodie
name = "purple hoodie"
desc = "A soft purple hoodie with a TailorCo brand on the tag."
@@ -482,6 +487,24 @@
icon_state = "gothic_shirtcross"
item_state = "gothic_shirtcross"
+/obj/item/clothing/suit/jacket/gentlecoat
+ name = "grey jacket"
+ desc = "A grey coat with a TailorCo brand on the tag. Looks expensive."
+ icon_state = "gentlecoat"
+ item_state = "gentlecoat"
+
+/obj/item/clothing/suit/toggle/jacket/greenjacket
+ name = "green outdoorsmans jacket"
+ desc = "A green jacket with a TailorCo brand on the tag. Looks expensive."
+ icon_state = "coatar"
+ item_state = "coatar"
+ togglename = "zipper"
+/obj/item/clothing/suit/toggle/jacket/fancytrench
+ name = "grey trenchcoat"
+ desc = "A custom-tailored trenchcoat with a TailorCo brand on the tag."
+ icon_state = "fancytrench"
+ item_state = "fancytrench"
+ togglename = "buttons"
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
desc = "Pompadour not included."
diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm
index 438904466c..926ff87c1d 100644
--- a/code/modules/events/anomaly.dm
+++ b/code/modules/events/anomaly.dm
@@ -24,7 +24,8 @@
/area/holodeck,
/area/shuttle,
/area/maintenance,
- /area/science/test_area)
+ /area/science/test_area,
+ /area/commons/cryopod)
)
//Subtypes from the above that actually should explode.
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index b032b84a77..798cd9a2f6 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -84,6 +84,12 @@
user.visible_message("[user] is scratching [user.p_their()] back as hard as [user.p_they()] can with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
+/obj/item/cultivator/bone
+ name = "bone cultivator"
+ desc = "A handle and a few bones tied together to resemble a hoe. Should work for removing weeds."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "cultivator_bone"
+
/obj/item/hatchet
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
@@ -112,6 +118,12 @@
playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return (BRUTELOSS)
+/obj/item/hatchet/bone
+ name = "bone hatchet"
+ desc = "A primitive hatchet made out of mostly bone, with some sinew to keep it together. It just might do for cutting logs into planks."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "hatchet_bone"
+
/obj/item/scythe
icon_state = "scythe0"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm
index 757fea08a8..5db7e8b3bb 100644
--- a/code/modules/instruments/instrument_data/hardcoded.dm
+++ b/code/modules/instruments/instrument_data/hardcoded.dm
@@ -7,11 +7,11 @@
instrument_flags = INSTRUMENT_LEGACY
volume_multiplier = 1 //not as loud as synth'd
-/datum/instrument/hardcoded/accordian
- name = "Accordian"
- id = "accordian"
+/datum/instrument/hardcoded/accordion
+ name = "Accordion"
+ id = "accordion"
legacy_instrument_ext = "mid"
- legacy_instrument_path = "accordian"
+ legacy_instrument_path = "accordion"
/datum/instrument/hardcoded/bikehorn
name = "Bike Horn"
diff --git a/code/modules/instruments/instrument_data/organ.dm b/code/modules/instruments/instrument_data/organ.dm
index 25da740998..edf9de9485 100644
--- a/code/modules/instruments/instrument_data/organ.dm
+++ b/code/modules/instruments/instrument_data/organ.dm
@@ -19,8 +19,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg')
-/datum/instrument/organ/crisis_accordian
- name = "Crisis Accordian"
+/datum/instrument/organ/crisis_accordion
+ name = "Crisis Accordion"
id = "crack"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg',
@@ -34,8 +34,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg')
-/datum/instrument/organ/crisis_tango_accordian
- name = "Crisis Tango Accordian"
+/datum/instrument/organ/crisis_tango_accordion
+ name = "Crisis Tango Accordion"
id = "crtango"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg',
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index 3cd6585af2..ef2ad0fc27 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -13,6 +13,15 @@
display_order = JOB_DISPLAY_ORDER_PRISONER
+/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, mob/M)
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/policy = policies[POLICYCONFIG_JOB_PRISONER]
+ if(policy)
+ var/mob/found = (M?.client && M) || (H?.client && H)
+ to_chat(found, " !!READ THIS!! The following is server-specific policy configuration and overrides anything said above if conflicting.")
+ to_chat(found, "
")
+ to_chat(found, "[policy]")
+
/datum/outfit/job/prisoner
name = "Prisoner"
jobtype = /datum/job/prisoner
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 0d312c485a..fd268a7774 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -232,6 +232,9 @@
return data
/obj/structure/chisel_message/ui_act(action, params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return
var/mob/user = usr
var/is_admin = check_rights_for(user.client, R_ADMIN)
var/is_creator = user.ckey == creator_key
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index ddec9232ce..45f1b1d94e 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -228,6 +228,13 @@
/obj/item/kinetic_crusher/glaive/update_icon_state()
item_state = "crusher[wielded]-glaive" // this is not icon_state and not supported by 2hcomponent
+/obj/item/kinetic_crusher/glaive/bone
+ name = "necropolis bone glaive"
+ desc = "Tribals trying to immitate technology have spent a long time to somehow assemble bits and pieces to work together just like the real thing. \
+ Although it does take a lot of effort and luck to create, it was a success."
+ icon_state = "crusher-bone"
+ item_state = "crusher0-bone"
+
//destablizing force
/obj/item/projectile/destabilizer
name = "destabilizing force"
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 31ee37c3b0..bb0ac0f957 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -179,6 +179,12 @@
custom_materials = list(/datum/material/iron=50)
w_class = WEIGHT_CLASS_SMALL
+/obj/item/shovel/spade/bone
+ name = "bone spade"
+ desc = "A bone spade, suitable for digging and moving dirt."
+ icon_state = "spade_bone"
+ toolspeed = 0.75
+
/obj/item/shovel/serrated
name = "serrated bone shovel"
desc = "A wicked tool that cleaves through dirt just as easily as it does flesh. The design was styled after ancient lavaland tribal designs."
diff --git a/code/modules/mob/living/brain/life.dm b/code/modules/mob/living/brain/life.dm
index 6d06da41ae..823d47dee2 100644
--- a/code/modules/mob/living/brain/life.dm
+++ b/code/modules/mob/living/brain/life.dm
@@ -25,9 +25,6 @@
else
emp_damage = max(emp_damage-1, 0)
-/mob/living/brain/handle_status_effects()
- return
-
/mob/living/brain/handle_traits()
return
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index 65e59d0e29..e98ddf5954 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -22,7 +22,7 @@
/mob/living/carbon/Moved()
. = ..()
- if(. && (movement_type & FLOATING)) //floating is easy
+ if(. && !CHECK_BITFIELD(movement_type, FLOATING)) //floating is easy
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
set_nutrition(NUTRITION_LEVEL_FED - 1) //just less than feeling vigorous
else if(nutrition && stat != DEAD)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d13a0f1149..5edc52376e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -83,6 +83,33 @@
. += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]"
. += "Absorbed DNA: [changeling.absorbedcount]"
+ //NINJACODE
+ if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)) //Only display if actually a ninja.
+ var/obj/item/clothing/suit/space/space_ninja/SN = wear_suit
+ . += "SpiderOS Status: [SN.s_initialized ? "Initialized" : "Disabled"]"
+ . += "Current Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]"
+ if(SN.s_initialized)
+ //Suit gear
+ . += "Energy Charge: [round(SN.cell.charge/100)]%"
+ //Ninja status
+ . += "Fingerprints: [md5(dna.uni_identity)]"
+ . += "Unique Identity: [dna.unique_enzymes]"
+ . += "Overall Status: [stat > 1 ? "dead" : "[health]% healthy"]"
+ . += "Nutrition Status: [nutrition]"
+ . += "Oxygen Loss: [getOxyLoss()]"
+ . += "Toxin Levels: [getToxLoss()]"
+ . += "Burn Severity: [getFireLoss()]"
+ . += "Brute Trauma: [getBruteLoss()]"
+ . += "Radiation Levels: [radiation] rad"
+ . += "Body Temperature: [bodytemperature-T0C] degrees C ([bodytemperature*1.8-459.67] degrees F)"
+
+ //Diseases
+ if(length(diseases))
+ . += "Viruses:"
+ for(var/thing in diseases)
+ var/datum/disease/D = thing
+ . += "* [D.name], Type: [D.spread_text], Stage: [D.stage]/[D.max_stages], Possible Cure: [D.cure_text]"
+
/mob/living/carbon/human/show_inv(mob/user)
user.set_machine(src)
var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 8464e15328..21554f25b4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1397,7 +1397,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
////////////
/datum/species/proc/handle_digestion(mob/living/carbon/human/H)
- if(HAS_TRAIT(src, TRAIT_NOHUNGER))
+ if(HAS_TRAIT(H, TRAIT_NOHUNGER))
return //hunger is for BABIES
//The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 6f0f5453da..a839a0dd83 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -570,24 +570,15 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
else
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "jittery")
- if(stuttering)
- stuttering = max(stuttering-1, 0)
+ if(druggy)
+ adjust_drugginess(-1)
- if(slurring || drunkenness)
- slurring = max(slurring-1,0,drunkenness)
-
- if(cultslurring)
- cultslurring = max(cultslurring-1, 0)
-
- if(clockcultslurring)
- clockcultslurring = max(clockcultslurring-1, 0)
+ if(drunkenness)
+ drunkenness = max(drunkenness-1,0)
if(silent)
silent = max(silent-1, 0)
- if(druggy)
- adjust_drugginess(-1)
-
if(hallucination)
handle_hallucinations()
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 43a5d9c2c8..0c73c623d1 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -150,11 +150,26 @@
/mob/living/proc/handle_stomach()
return
-//this updates all special effects: knockdown, druggy, stuttering, etc..
+/*
+ * this updates some effects: mostly old stuff such as drunkness, druggy, stuttering, etc.
+ * that should be converted to status effect datums one day.
+ */
/mob/living/proc/handle_status_effects()
if(confused)
confused = max(0, confused - 1)
+ if(stuttering)
+ stuttering = max(stuttering-1, 0)
+
+ if(slurring)
+ slurring = max(slurring-1,0)
+
+ if(cultslurring)
+ cultslurring = max(cultslurring-1, 0)
+
+ if(clockcultslurring)
+ clockcultslurring = max(clockcultslurring-1, 0)
+
/mob/living/proc/handle_traits()
//Eyes
if(eye_blind) //blindness, heals slowly over time
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index 0ccc03982a..bdc44ab356 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
/// Clickdelay duration post-parry if you fail to parry an attack
var/parry_failed_clickcd_duration = 0 SECONDS
/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
- var/parry_failed_cooldown_duration = 0 SECONDS
+ var/parry_failed_cooldown_duration = 3.5 SECONDS
// Advanced
/// Flags added to return value
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index c339aa920f..ca5d3ce459 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -1,5 +1,3 @@
-#define PAI_EMP_SILENCE_DURATION 3 MINUTES
-
/mob/living/silicon/pai/blob_act(obj/structure/blob/B)
return FALSE
@@ -9,7 +7,7 @@
return
take_holo_damage(severity/2)
DefaultCombatKnockdown(severity*4)
- silent = max(silent, (PAI_EMP_SILENCE_DURATION) / SSmobs.wait / severity)
+ short_radio()
if(holoform)
fold_in(force = TRUE)
emitter_next_use = world.time + emitter_emp_cd
diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
index 61436cea1c..a6312b9ddf 100644
--- a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
+++ b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
@@ -66,6 +66,7 @@ GLOBAL_LIST(bad_gremlin_items)
/mob/living/simple_animal/hostile/gremlin/Initialize()
. = ..()
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+ ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, INNATE_TRAIT)
access_card = new /obj/item/card/id(src)
var/datum/job/captain/C = new /datum/job/captain
access_card.access = C.get_access()
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 8388d6501a..747abb4b19 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -95,20 +95,78 @@
/mob/living/simple_animal/hostile/carp/cayenne
name = "Cayenne"
+ real_name = "Cayenne"
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
- regen_amount = 8
-
speak_emote = list("squeaks")
- maxHealth = 90
- health = 90
- gold_core_spawnable = NO_SPAWN
- faction = list(ROLE_SYNDICATE, "carp") //They are still a carp
AIStatus = AI_OFF
+ gold_core_spawnable = NO_SPAWN
+ faction = list(ROLE_SYNDICATE)
+ /// Keeping track of the nuke disk for the functionality of storing it.
+ var/obj/item/disk/nuclear/disky
+ /// Location of the file storing disk overlays
+ // var/icon/disk_overlay_file = 'icons/mob/carp.dmi'
+ /// Colored disk mouth appearance for adding it as a mouth overlay
+ var/mutable_appearance/colored_disk_mouth
- harm_intent_damage = 12
- obj_damage = 70
- melee_damage_lower = 15
- melee_damage_upper = 18
+/mob/living/simple_animal/hostile/carp/cayenne/Initialize()
+ . = ..()
+ // AddElement(/datum/element/pet_bonus, "bloops happily!")
+ // colored_disk_mouth = mutable_appearance(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/carp/disk_mouth, greyscale_colors), "disk_mouth")
+ ADD_TRAIT(src, TRAIT_DISK_VERIFIER, INNATE_TRAIT) //carp can verify disky
+
+/mob/living/simple_animal/hostile/carp/cayenne/IsAdvancedToolUser()
+ return TRUE //carp SMART
+
+/mob/living/simple_animal/hostile/carp/cayenne/death(gibbed)
+ if(disky)
+ disky.forceMove(drop_location())
+ disky = null
+ return ..()
+
+/mob/living/simple_animal/hostile/carp/cayenne/Destroy(force)
+ QDEL_NULL(disky)
+ return ..()
+
+/mob/living/simple_animal/hostile/carp/cayenne/examine(mob/user)
+ . = ..()
+ if(disky)
+ . += span_notice("Wait... is that [disky] in [p_their()] mouth?")
+
+/mob/living/simple_animal/hostile/carp/cayenne/AttackingTarget(atom/attacked_target)
+ if(istype(attacked_target, /obj/item/disk/nuclear))
+ var/obj/item/disk/nuclear/potential_disky = attacked_target
+ if(potential_disky.anchored)
+ return
+ potential_disky.forceMove(src)
+ disky = potential_disky
+ to_chat(src, span_nicegreen("YES!! You manage to pick up [disky]. (Click anywhere to place it back down.)"))
+ update_icon()
+ if(!disky.fake)
+ client.give_award(/datum/award/achievement/misc/cayenne_disk, src)
+ return
+ if(disky)
+ if(isopenturf(attacked_target))
+ to_chat(src, span_notice("You place [disky] on [attacked_target]"))
+ disky.forceMove(attacked_target.drop_location())
+ disky = null
+ update_icon()
+ else
+ disky.melee_attack_chain(src, attacked_target)
+ return
+ return ..()
+
+/mob/living/simple_animal/hostile/carp/cayenne/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(disky == gone)
+ disky = null
+ update_icon()
+
+/mob/living/simple_animal/hostile/carp/cayenne/update_overlays()
+ . = ..()
+ if(!disky || stat == DEAD)
+ return
+ // . += colored_disk_mouth
+ // . += mutable_appearance(disk_overlay_file, "disk_overlay")
#undef REGENERATION_DELAY
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index 869f29951b..938483be84 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -32,6 +32,9 @@ Difficulty: Hard
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
+ achievement_type = /datum/award/achievement/boss/wendigo_kill
+ crusher_achievement_type = /datum/award/achievement/boss/wendigo_crusher
+ score_achievement_type = /datum/award/score/wendigo_score
deathmessage = "falls, shaking the ground around it"
deathsound = 'sound/effects/gravhit.ogg'
attack_action_types = list(/datum/action/innate/megafauna_attack/heavy_stomp,
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index d677f59440..de6b858f79 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -176,6 +176,12 @@ While using this makes the system rely on OnFire, it still gives options for tim
elitemind = pick(candidates)
elitemind.playsound_local(get_turf(elitemind), 'sound/effects/magic.ogg', 40, 0)
to_chat(elitemind, "You have been chosen to play as a Lavaland Elite.\nIn a few seconds, you will be summoned on Lavaland as a monster to fight your activator, in a fight to the death.\nYour attacks can be switched using the buttons on the top left of the HUD, and used by clicking on targets or tiles similar to a gun.\nWhile the opponent might have an upper hand with powerful mining equipment and tools, you have great power normally limited by AI mobs.\nIf you want to win, you'll have to use your powers in creative ways to ensure the kill. It's suggested you try using them all as soon as possible.\nShould you win, you'll receive extra information regarding what to do after. Good luck!")
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/policy = policies[POLICYCONFIG_ELITE_SPAWN]
+ if(policy)
+ to_chat(elitemind, " !!READ THIS!! The following is server-specific policy configuration and overrides anything said above if conflicting.")
+ to_chat(elitemind, "
")
+ to_chat(elitemind, "[policy]")
addtimer(CALLBACK(src, .proc/spawn_elite, elitemind), 100)
else
visible_message("The stirring stops, and nothing emerges. Perhaps try again later.")
@@ -304,6 +310,12 @@ While using this makes the system rely on OnFire, it still gives options for tim
to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your purpose is now for you to decide.")
to_chat(mychild, "Your max health has been halved, but can now heal by standing on your tumor. Note, it's your only way to heal.\nBear in mind, if anyone interacts with your tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain your full max health.\nAlso, be weary of your fellow inhabitants, they likely won't be happy to see you!")
to_chat(mychild, "Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!")
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/policy = policies[POLICYCONFIG_ELITE_WIN]
+ if(policy)
+ to_chat(mychild, " !!READ THIS!! The following is server-specific policy configuration and overrides anything said above if conflicting.")
+ to_chat(mychild, "
")
+ to_chat(mychild, "[policy]")
/obj/item/tumor_shard
name = "tumor shard"
@@ -332,6 +344,12 @@ While using this makes the system rely on OnFire, it still gives options for tim
E.playsound_local(get_turf(E), 'sound/effects/magic.ogg', 40, 0)
to_chat(E, "You have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!")
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/policy = policies[POLICYCONFIG_ELITE_SENTIENCE]
+ if(policy)
+ to_chat(E, " !!READ THIS!! The following is server-specific policy configuration and overrides anything said above if conflicting.")
+ to_chat(E, "
")
+ to_chat(E, "[policy]")
E.maxHealth = E.maxHealth * 0.5
E.health = E.maxHealth
E.desc = "[E.desc] However, this one appears appears less wild in nature, and calmer around people."
diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
index 2b92894317..497359829e 100644
--- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
if(LAZYLEN(GLOB.plague_rats) >= cap)
visible_message("[src] gnaws into its food, [cap] rats are now on the station!")
return
- var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc)
+ new /mob/living/simple_animal/hostile/plaguerat(loc)
visible_message("[src] gnaws into its food, attracting another rat!")
/mob/living/simple_animal/hostile/plaguerat/proc/exit_vents()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 65c553b11d..dc892364c4 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -195,12 +195,6 @@
stat = CONSCIOUS
med_hud_set_status()
-
-/mob/living/simple_animal/handle_status_effects()
- ..()
- if(stuttering)
- stuttering = 0
-
/mob/living/simple_animal/proc/handle_automated_action()
set waitfor = FALSE
return
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 7e857a4e0d..153d7dd973 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -113,6 +113,7 @@
multiplicative_slowdown = CRAWLING_ADD_SLOWDOWN
movetypes = CRAWLING
flags = IGNORE_NOSLOW
+ priority = 20000
/datum/movespeed_modifier/mob_config_speedmod
variable = TRUE
diff --git a/code/modules/ninja/__ninjaDefines.dm b/code/modules/ninja/__ninjaDefines.dm
index 3f5db48407..0cfd1a4895 100644
--- a/code/modules/ninja/__ninjaDefines.dm
+++ b/code/modules/ninja/__ninjaDefines.dm
@@ -15,7 +15,6 @@
//Defines for the suit's unique abilities
#define IS_NINJA_SUIT_INITIALIZATION(action) (istype(action, /datum/action/item_action/initialize_ninja_suit))
-#define IS_NINJA_SUIT_STATUS(action) (istype(action, /datum/action/item_action/ninjastatus))
#define IS_NINJA_SUIT_BOOST(action) (istype(action, /datum/action/item_action/ninjaboost))
#define IS_NINJA_SUIT_EMP(action) (istype(action, /datum/action/item_action/ninjapulse))
#define IS_NINJA_SUIT_STAR_CREATION(action) (istype(action, /datum/action/item_action/ninjastar))
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
index 0bedd31c72..33e6b1ae26 100644
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
+++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
@@ -5,35 +5,3 @@
button_icon_state = "health"
icon_icon = 'icons/obj/device.dmi'
var/action_background_icon_state = "bg_default_on"
-
-/**
- * Proc called to put a status readout to the ninja in chat.
- *
- * Called put some information about the ninja's current status into chat.
- * This information used to be displayed constantly on the status tab screen
- * when the suit was on, but was turned into this as to remove the code from
- * human.dm
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjastatus()
- var/mob/living/carbon/human/ninja = affecting
- var/list/info_list = list()
- info_list += "SpiderOS Status: [s_initialized ? "Initialized" : "Disabled"]\n"
- //Ninja status
- info_list += "Fingerprints: [md5(ninja.dna.uni_identity)]\n"
- info_list += "Unique Identity: [ninja.dna.unique_enzymes]\n"
- info_list += "Overall Status: [ninja.stat > 1 ? "dead" : "[ninja.health]% healthy"]\n"
- info_list += "Nutrition Status: [ninja.nutrition]\n"
- info_list += "Oxygen Loss: [ninja.getOxyLoss()]\n"
- info_list += "Toxin Levels: [ninja.getToxLoss()]\n"
- info_list += "Burn Severity: [ninja.getFireLoss()]\n"
- info_list += "Brute Trauma: [ninja.getBruteLoss()]\n"
- info_list += "Radiation Levels: [ninja.radiation] rad\n"
- info_list += "Body Temperature: [ninja.bodytemperature-T0C] degrees C ([ninja.bodytemperature*1.8-459.67] degrees F)\n"
-
- //Diseases
- if(length(ninja.diseases))
- info_list += "Viruses:"
- for(var/datum/disease/ninja_disease in ninja.diseases)
- info_list += "* [ninja_disease.name], Type: [ninja_disease.spread_text], Stage: [ninja_disease.stage]/[ninja_disease.max_stages], Possible Cure: [ninja_disease.cure_text]\n"
-
- to_chat(ninja, "[info_list.Join()]")
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 66d9a85290..d9d362c43c 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -121,9 +121,6 @@
if(s_coold > 0)
to_chat(user, "ERROR: suit is on cooldown.")
return FALSE
- if(IS_NINJA_SUIT_STATUS(action))
- ninjastatus()
- return TRUE
if(IS_NINJA_SUIT_BOOST(action))
ninjaboost()
return TRUE
diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm
index 659d9ae2c7..95ba17c733 100644
--- a/code/modules/projectiles/boxes_magazines/external/lmg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm
@@ -23,4 +23,10 @@
/obj/item/ammo_box/magazine/mm712x82/match
name = "box magazine (Match 7.12x82mm)"
+ icon_state = "a762-50"
ammo_type = /obj/item/ammo_casing/mm712x82/match
+ max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm712x82/update_icon()
+ ..()
+ icon_state = "a762-[round(ammo_count(),10)]"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 3e7e2c9e9c..eea16ac636 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -24,6 +24,7 @@
playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1)
A.update_icon()
update_icon()
+ user.SetNextAction(CLICK_CD_MELEE)
/obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0)
return ..() //changed argument value
@@ -240,7 +241,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "warden's combat shotgun"
- desc = "A modified version of the semi automatic combat shotgun with a collapsible stock. For close encounters."
+ desc = "A modified version of the semi-automatic combat shotgun with a collapsible stock and a safety that prevents firing while folded. For close encounters."
icon_state = "cshotgunc"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_NORMAL
@@ -250,7 +251,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/AltClick(mob/living/user)
. = ..()
- if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || item_flags && IN_STORAGE)
return
toggle_stock(user)
return TRUE
@@ -276,6 +277,14 @@
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon_state()
icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]"
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/afterattack(atom/target, mob/living/user, flag, params)
+ if(!stock)
+ shoot_with_empty_chamber(user)
+ to_chat(user, "[src] won't fire with a folded stock!")
+ else
+ . = ..()
+ update_icon()
+
//Dual Feed Shotgun
/obj/item/gun/ballistic/shotgun/automatic/dual_tube
diff --git a/code/modules/projectiles/guns/magic/motivation.dm b/code/modules/projectiles/guns/magic/motivation.dm
index 0eaeea4418..a33165b28b 100644
--- a/code/modules/projectiles/guns/magic/motivation.dm
+++ b/code/modules/projectiles/guns/magic/motivation.dm
@@ -1,6 +1,6 @@
/obj/item/gun/magic/staff/motivation
name = "Motivation"
- desc = "Rumored to have the ability to open up a portal the depths of Lavaland."
+ desc = "Rumored to have the ability to open up a portal to the depths of Lavaland."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "motivation"
item_state = "motivation"
@@ -21,15 +21,15 @@
recharge_rate = 5
var/datum/action/judgement_cut/judgementcut = new/datum/action/judgement_cut()
block_parry_data = /datum/block_parry_data/motivation
-
+
//to get this to toggle correctly
/obj/item/gun/magic/staff/motivation/Initialize()
. = ..()
judgementcut = new(src)
-//lets the user know that their judgment cuts are recharging
+//lets the user know that their judgement cuts are recharging
/obj/item/gun/magic/staff/motivation/shoot_with_empty_chamber(mob/living/user as mob|obj)
- to_chat(user, "Judgment Cut is recharging.")
+ to_chat(user, "Judgement Cut is recharging.")
//action button to toggle judgement cuts on/off
/datum/action/judgement_cut
@@ -47,7 +47,7 @@
/obj/item/gun/magic/staff/motivation/can_trigger_gun(mob/living/user)
. = ..()
if(!judgementcut.judgement_toggled)
- to_chat(user, " Judgment Cut is disabled.")
+ to_chat(user, "Judgement Cut is disabled.")
return FALSE
//adds/removes judgement cut and judgement cut end upon pickup/drop
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 02c8a9802c..f59e45ff01 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -84,6 +84,7 @@
else
reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
D.add_atom_colour(mix_color_from_reagents(D.reagents.reagent_list), TEMPORARY_COLOUR_PRIORITY)
+ playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
last_spray = world.time
INVOKE_ASYNC(D, /obj/effect/decal/chempuff/proc/run_puff, A)
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
index fe9ffe2035..fbfd626ae7 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
@@ -37,7 +37,7 @@
build_path = /obj/item/storage/bag/tray
category = list("initial","Dinnerware")
-/datum/design/tray
+/datum/design/cafeteria_tray
name = "Cafeteria Tray"
id = "foodtray"
build_type = AUTOLATHE
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index 81a837504a..e3cc63c3a0 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -242,13 +242,24 @@
sleep(30)
playsound(C, 'sound/machines/defib_zap.ogg', 50, FALSE)
if(check_revivable())
+ var/tplus = world.time - C.timeofdeath
playsound(C, 'sound/machines/defib_success.ogg', 50, FALSE)
C.set_heartattack(FALSE)
+ var/oxydamage = C.getOxyLoss()
+ if(C.health < HEALTH_THRESHOLD_FULLCRIT && oxydamage)
+ var/diff = C.health - HEALTH_THRESHOLD_FULLCRIT
+ C.adjustOxyLoss(diff) //Heal their oxydamage up to hardcrit (or if less, as much as they have, since the proc has sanity)
C.revive(full_heal = FALSE, admin_revive = FALSE)
C.emote("gasp")
C.Jitter(100)
SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
- log_game("[C] has been successfully defibrillated by nanites.")
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds
+ var/late = timelimit && (tplus > timelimit)
+ var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT]
+ if(policy)
+ to_chat(C, policy)
+ C.log_message("has been successfully defibrillated by nanites, [tplus] deciseconds from time of death, considered [late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME)
else
playsound(C, 'sound/machines/defib_failed.ogg', 50, FALSE)
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 3a08a764d3..e66f14da93 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -59,13 +59,13 @@
one though."
icon_state = "default_human_l_arm"
attack_verb = list("slapped", "punched")
- max_damage = 150
+ max_damage = 50
disable_threshold = 75
max_stamina_damage = 50
body_zone = BODY_ZONE_L_ARM
body_part = ARM_LEFT
aux_icons = list(BODY_ZONE_PRECISE_L_HAND = HANDS_PART_LAYER, "l_hand_behind" = BODY_BEHIND_LAYER)
- body_damage_coeff = 0.25
+ body_damage_coeff = 0.75
held_index = 1
px_x = -6
px_y = 0
@@ -121,12 +121,12 @@
among humans missing their right arm."
icon_state = "default_human_r_arm"
attack_verb = list("slapped", "punched")
- max_damage = 150
+ max_damage = 50
disable_threshold = 75
body_zone = BODY_ZONE_R_ARM
body_part = ARM_RIGHT
aux_icons = list(BODY_ZONE_PRECISE_R_HAND = HANDS_PART_LAYER, "r_hand_behind" = BODY_BEHIND_LAYER)
- body_damage_coeff = 0.25
+ body_damage_coeff = 0.75
held_index = 2
px_x = 6
px_y = 0
@@ -184,11 +184,11 @@
luck. In this instance, it probably would not have helped."
icon_state = "default_human_l_leg"
attack_verb = list("kicked", "stomped")
- max_damage = 150
+ max_damage = 50
disable_threshold = 75
body_zone = BODY_ZONE_L_LEG
body_part = LEG_LEFT
- body_damage_coeff = 0.25
+ body_damage_coeff = 0.75
px_x = -2
px_y = 12
stam_heal_tick = STAM_RECOVERY_LIMB
@@ -243,11 +243,10 @@
// alternative spellings of 'pokey' are availible
icon_state = "default_human_r_leg"
attack_verb = list("kicked", "stomped")
- max_damage = 150
- disable_threshold = 75
+ max_damage = 50
body_zone = BODY_ZONE_R_LEG
body_part = LEG_RIGHT
- body_damage_coeff = 0.25
+ body_damage_coeff = 0.75
px_x = 2
px_y = 12
max_stamina_damage = 50
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 0f1004221c..5c7b71b779 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -48,6 +48,13 @@
w_class = WEIGHT_CLASS_TINY
toolspeed = 0.5
+/obj/item/retractor/ashwalker
+ name = "bontractor"
+ desc = "Kinda looks like a chicken bone."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "retractor_bone"
+ toolspeed = 0.85
+
/obj/item/hemostat
name = "hemostat"
desc = "You think you have seen this before."
@@ -78,6 +85,14 @@
toolspeed = 0.5
attack_verb = list("attacked", "pinched")
+/obj/item/hemostat/ashwalker
+ name = "femurstat"
+ desc = "Bones that are strapped together with sinews. Used to stop bleeding."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "hemostat_bone"
+ toolspeed = 0.85
+
+
/obj/item/cautery
name = "cautery"
desc = "This stops bleeding."
@@ -108,6 +123,13 @@
toolspeed = 0.5
attack_verb = list("burnt")
+/obj/item/cautery/ashwalker
+ name = "coretery"
+ desc = "A legion core strapped to a bone. It can close wounds."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "cautery_bone"
+ toolspeed = 0.85
+
/obj/item/surgicaldrill
name = "surgical drill"
desc = "You can drill using this item. You dig?"
@@ -257,6 +279,14 @@
user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
+/obj/item/scalpel/ashwalker
+ name = "diamond scalpel"
+ desc = "Bones and a Diamond tied together to make a scalpel."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "scalpel_bone"
+ force = 12
+ toolspeed = 0.85
+
/obj/item/circular_saw
name = "circular saw"
desc = "For heavy duty cutting."
@@ -309,6 +339,14 @@
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharpness = SHARP_EDGED
+/obj/item/circular_saw/ashwalker
+ name = "diamond bonesaw"
+ desc = "Bones designed like a skull, with diamond teeth to cut through bones."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "saw_bone"
+ force = 12
+ toolspeed = 0.85
+
/obj/item/surgical_drapes
name = "surgical drapes"
desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
@@ -341,6 +379,13 @@
prototype = SSresearch.techweb_design_by_id(id)
. |= prototype.surgery
+
+/obj/item/surgical_drapes/goliath
+ name = "goliath drapes"
+ desc = "Probably not the most hygienic but what the heck else are you gonna use?"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "surgical_drapes_goli"
+
/obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands
name = "organ storage bag"
desc = "A container for holding body parts."
@@ -433,3 +478,10 @@
to_chat(user, "You refrain from hitting [L] with [src], as you are in help intent.")
return
return ..()
+
+/obj/item/bonesetter/bone
+ name = "bone bonesetter"
+ desc = "A bonesetter made of bones... for setting bones with... bones?"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "bone setter_bone"
+ toolspeed = 0.85
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index 565c595473..d858c2d6bf 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -74,7 +74,7 @@
* return bool If the user's input has been handled and the UI should update.
*/
/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- // SHOULD_CALL_PARENT(TRUE)
+ SHOULD_CALL_PARENT(TRUE)
// If UI is not interactive or usr calling Topic is not the UI user, bail.
if(!ui || ui.status != UI_INTERACTIVE)
return TRUE
@@ -145,6 +145,7 @@
* client/verb/uiclose(), which closes the ui window
*/
/datum/proc/ui_close(mob/user)
+ SIGNAL_HANDLER
/**
* verb
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 55497b150a..a0c39258b9 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -58,11 +58,16 @@
src.interface = interface
if(title)
src.title = title
- src.state = src_object.ui_state()
+ src.state = src_object.ui_state(user)
// Deprecated
if(ui_x && ui_y)
src.window_size = list(ui_x, ui_y)
+/datum/tgui/Destroy()
+ user = null
+ src_object = null
+ return ..()
+
/**
* public
*
diff --git a/code/modules/tgui/tgui_alert.dm b/code/modules/tgui/tgui_alert.dm
index d144588ad9..83a26c2963 100644
--- a/code/modules/tgui/tgui_alert.dm
+++ b/code/modules/tgui/tgui_alert.dm
@@ -8,8 +8,9 @@
* * title - The of the alert modal, shown on the top of the TGUI window.
* * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
* * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout.
+ * * autofocus - The bool that controls if this alert should grab window focus.
*/
-/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0)
+/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE)
if (!user)
user = usr
if (!istype(user))
@@ -18,7 +19,7 @@
user = client.mob
else
return
- var/datum/tgui_modal/alert = new(user, message, title, buttons, timeout)
+ var/datum/tgui_modal/alert = new(user, message, title, buttons, timeout, autofocus)
alert.ui_interact(user)
alert.wait()
if (alert)
@@ -36,8 +37,9 @@
* * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
* * callback - The callback to be invoked when a choice is made.
* * timeout - The timeout of the alert, after which the modal will close and qdel itself. Disabled by default, can be set to seconds otherwise.
+ * * autofocus - The bool that controls if this alert should grab window focus.
*/
-/proc/tgui_alert_async(mob/user, message = null, title = null, list/buttons = list("Ok"), datum/callback/callback, timeout = 0)
+/proc/tgui_alert_async(mob/user, message = null, title = null, list/buttons = list("Ok"), datum/callback/callback, timeout = 0, autofocus = TRUE)
if (!user)
user = usr
if (!istype(user))
@@ -46,7 +48,7 @@
user = client.mob
else
return
- var/datum/tgui_modal/async/alert = new(user, message, title, buttons, callback, timeout)
+ var/datum/tgui_modal/async/alert = new(user, message, title, buttons, callback, timeout, autofocus)
alert.ui_interact(user)
/**
@@ -68,13 +70,16 @@
var/start_time
/// The lifespan of the tgui_modal, after which the window will close and delete itself.
var/timeout
+ /// The bool that controls if this modal should grab window focus
+ var/autofocus
/// Boolean field describing if the tgui_modal was closed by the user.
var/closed
-/datum/tgui_modal/New(mob/user, message, title, list/buttons, timeout)
+/datum/tgui_modal/New(mob/user, message, title, list/buttons, timeout, autofocus)
src.title = title
src.message = message
src.buttons = buttons.Copy()
+ src.autofocus = autofocus
if (timeout)
src.timeout = timeout
start_time = world.time
@@ -110,7 +115,8 @@
. = list(
"title" = title,
"message" = message,
- "buttons" = buttons
+ "buttons" = buttons,
+ "autofocus" = autofocus
)
if(timeout)
@@ -140,8 +146,8 @@
/// The callback to be invoked by the tgui_modal upon having a choice made.
var/datum/callback/callback
-/datum/tgui_modal/async/New(mob/user, message, title, list/buttons, callback, timeout)
- ..(user, message, title, buttons, timeout)
+/datum/tgui_modal/async/New(mob/user, message, title, list/buttons, callback, timeout, autofocus)
+ ..(user, message, title, buttons, timeout, autofocus)
src.callback = callback
/datum/tgui_modal/async/Destroy(force, ...)
diff --git a/code/modules/tgui/tgui_input_list.dm b/code/modules/tgui/tgui_input_list.dm
index 242b69a934..a02dfac5f5 100644
--- a/code/modules/tgui/tgui_input_list.dm
+++ b/code/modules/tgui/tgui_input_list.dm
@@ -82,6 +82,7 @@
src.message = message
src.buttons = list()
src.buttons_map = list()
+ var/list/repeat_buttons = list()
// Gets rid of illegal characters
var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"})
@@ -89,6 +90,9 @@
for(var/i in buttons)
var/string_key = whitelistedWords.Replace("[i]", "")
+ //avoids duplicated keys E.g: when areas have the same name
+ string_key = avoid_assoc_duplicate_keys(string_key, repeat_buttons)
+
src.buttons += string_key
src.buttons_map[string_key] = i
@@ -144,7 +148,7 @@
if("choose")
if (!(params["choice"] in buttons))
return
- choice = buttons_map[params["choice"]]
+ set_choice(buttons_map[params["choice"]])
SStgui.close_uis(src)
return TRUE
if("cancel")
@@ -152,6 +156,9 @@
closed = TRUE
return TRUE
+/datum/tgui_list_input/proc/set_choice(choice)
+ src.choice = choice
+
/**
* # async tgui_list_input
*
@@ -162,23 +169,17 @@
var/datum/callback/callback
/datum/tgui_list_input/async/New(mob/user, message, title, list/buttons, callback, timeout)
- ..(user, title, message, buttons, timeout)
+ ..(user, message, title, buttons, timeout)
src.callback = callback
/datum/tgui_list_input/async/Destroy(force, ...)
QDEL_NULL(callback)
. = ..()
-/datum/tgui_list_input/async/ui_close(mob/user)
+/datum/tgui_list_input/async/set_choice(choice)
. = ..()
- qdel(src)
-
-/datum/tgui_list_input/async/ui_act(action, list/params)
- . = ..()
- if (!. || choice == null)
- return
- callback.InvokeAsync(choice)
- qdel(src)
+ if(!isnull(src.choice))
+ callback?.InvokeAsync(src.choice)
/datum/tgui_list_input/async/wait()
return
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index ae54b2dd3f..af6b5bdc74 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -258,7 +258,7 @@
if(istype(asset, /datum/asset/spritesheet))
var/datum/asset/spritesheet/spritesheet = asset
send_message("asset/stylesheet", spritesheet.css_filename())
- send_message("asset/mappings", asset.get_url_mappings())
+ send_raw_message(asset.get_serialized_url_mappings())
/**
* private
diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm
index f13d11736f..0032f83d09 100644
--- a/code/modules/uplink/uplink_items/uplink_dangerous.dm
+++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm
@@ -292,7 +292,5 @@
desc = "An ancient blade said to have ties with Lavaland's most inner demons. \
Allows you to cut from a far distance!"
item = /obj/item/gun/magic/staff/motivation
- cost = 20
- player_minimum = 20
+ cost = 10
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
- cant_discount = TRUE
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index 12e9f365d0..d0144269b7 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -91,9 +91,9 @@
/obj/vehicle/proc/after_add_occupant(mob/M)
auto_assign_occupant_flags(M)
-/obj/vehicle/proc/auto_assign_occupant_flags(mob/M) //override for each type that needs it. Default is assign driver if drivers is not at max.
+/obj/vehicle/proc/auto_assign_occupant_flags(mob/M) //override for each type that needs it. Default is assign driver if drivers is not at max.
if(driver_amount() < max_drivers)
- add_control_flags(M, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_PERMISSION)
+ add_control_flags(M, VEHICLE_CONTROL_DRIVE)
/obj/vehicle/proc/remove_occupant(mob/M)
if(!istype(M))
diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm
index 08a7986fa3..0196abe82c 100644
--- a/code/modules/vehicles/cars/car.dm
+++ b/code/modules/vehicles/cars/car.dm
@@ -16,7 +16,7 @@
. = ..()
initialize_controller_action_type(/datum/action/vehicle/sealed/remove_key, VEHICLE_CONTROL_DRIVE)
if(car_traits & CAN_KIDNAP)
- initialize_controller_action_type(/datum/action/vehicle/sealed/DumpKidnappedMobs, VEHICLE_CONTROL_DRIVE)
+ initialize_controller_action_type(/datum/action/vehicle/sealed/dump_kidnapped_mobs, VEHICLE_CONTROL_DRIVE)
/obj/vehicle/sealed/car/driver_move(mob/user, direction)
if(key_type && !is_key(inserted_key))
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 0b75dbf4db..c4da65a902 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -1,6 +1,6 @@
/obj/vehicle/sealed/car/clowncar
name = "clown car"
- desc = "How someone could even fit in there is beyond me."
+ desc = "How someone could even fit in there is byond me."
icon_state = "clowncar"
max_integrity = 150
armor = list("melee" = 70, "bullet" = 40, "laser" = 40, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
@@ -10,25 +10,36 @@
car_traits = CAN_KIDNAP
key_type = /obj/item/bikehorn
key_type_exact = FALSE
- var/droppingoil = FALSE
- var/RTDcooldown = 150
- var/lastRTDtime = 0
+ ///list of headlight colors we use to pick through when we have party mode due to emag
+ var/headlight_colors = list(COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, COLOR_LIME, COLOR_BRIGHT_BLUE, COLOR_CYAN, COLOR_PURPLE)
+ ///Cooldown time inbetween [/obj/vehicle/sealed/car/clowncar/proc/roll_the_dice()] usages
+ var/dice_cooldown_time = 150
+ ///How many times kidnappers in the clown car said thanks
+ var/thankscount = 0
+ ///Current status of the cannon, alternates between CLOWN_CANNON_INACTIVE, CLOWN_CANNON_BUSY and CLOWN_CANNON_READY
+ var/cannonmode = CLOWN_CANNON_INACTIVE
+ var/light_on = TRUE
+
+/obj/vehicle/sealed/car/clowncar/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj,src)
+
+/obj/vehicle/sealed/car/clowncar/process()
+ if(light_on && (obj_flags & EMAGGED))
+ set_light_color(pick(headlight_colors))
/obj/vehicle/sealed/car/clowncar/generate_actions()
. = ..()
- initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE)
-
-/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space
- if(isspaceturf(get_step(src, direction)))
- return FALSE
- else
- return ..()
+ initialize_controller_action_type(/datum/action/vehicle/sealed/horn, VEHICLE_CONTROL_DRIVE)
+ initialize_controller_action_type(/datum/action/vehicle/sealed/thank, VEHICLE_CONTROL_KIDNAPPED)
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.mind && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //Ensures only clowns can drive the car. (Including more at once)
- add_control_flags(M, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_PERMISSION)
+ add_control_flags(H, VEHICLE_CONTROL_DRIVE)
+ RegisterSignal(H, COMSIG_MOB_CLICKON, .proc/fire_cannon_at)
+ M.log_message("has entered [src] as a possible driver", LOG_ATTACK)
return
add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED)
@@ -36,106 +47,195 @@
. = ..()
playsound(src, pick('sound/vehicles/clowncar_load1.ogg', 'sound/vehicles/clowncar_load2.ogg'), 75)
+/obj/vehicle/sealed/car/clowncar/after_add_occupant(mob/M, control_flags)
+ . = ..()
+ if(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED).len >= 30)
+ for(var/mob/voreman as anything in return_drivers())
+ voreman.client.give_award(/datum/award/achievement/misc/round_and_full, voreman)
+
+/obj/vehicle/sealed/car/clowncar/attack_animal(mob/living/simple_animal/user, list/modifiers)
+ if((user.loc != src) || user.environment_smash & (ENVIRONMENT_SMASH_WALLS|ENVIRONMENT_SMASH_RWALLS))
+ return ..()
+
+/obj/vehicle/sealed/car/clowncar/mob_exit(mob/M, silent = FALSE, randomstep = FALSE)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_CLICKON)
+
/obj/vehicle/sealed/car/clowncar/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
if(prob(33))
- visible_message("[src] spews out a ton of space lube!")
+ visible_message(span_danger("[src] spews out a ton of space lube!"))
new /obj/effect/particle_effect/foam(loc) //YEET
-/obj/vehicle/sealed/car/clowncar/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+/obj/vehicle/sealed/car/clowncar/attacked_by(obj/item/I, mob/living/user)
. = ..()
- if(istype(I, /obj/item/reagent_containers/food/snacks/grown/banana))
- var/obj/item/reagent_containers/food/snacks/grown/banana/banana = I
- obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity)
- to_chat(user, "You use the [banana] to repair the [src]!")
- qdel(banana)
+ if(!istype(I, /obj/item/reagent_containers/food/snacks/grown/banana))
+ return
+ var/obj/item/reagent_containers/food/snacks/grown/banana/banana = I
+ obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity)
+ to_chat(user, span_danger("You use the [banana] to repair the [src]!"))
+ qdel(banana)
-/obj/vehicle/sealed/car/clowncar/Bump(atom/movable/M)
+/obj/vehicle/sealed/car/clowncar/Bump(atom/bumped)
. = ..()
- if(isliving(M))
- if(ismegafauna(M))
+ if(isliving(bumped))
+ if(ismegafauna(bumped))
return
- var/mob/living/L = M
- if(iscarbon(L))
- var/mob/living/carbon/C = L
- C.DefaultCombatKnockdown(40) //I play to make sprites go horizontal
- L.visible_message("[src] rams into [L] and sucks him up!") //fuck off shezza this isn't ERP.
- mob_forced_enter(L)
+ var/mob/living/hittarget_living = bumped
+ if(iscarbon(hittarget_living))
+ var/mob/living/carbon/carb = hittarget_living
+ carb.DefaultCombatKnockdown(40) //I play to make sprites go horizontal
+ hittarget_living.visible_message(span_warning("[src] rams into [hittarget_living] and sucks [hittarget_living.p_them()] up!")) //fuck off shezza this isn't ERP.
+ mob_forced_enter(hittarget_living)
playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75)
- else if(istype(M, /turf/closed) || istype(M, /obj/machinery/door/airlock/external))
- visible_message("[src] rams into [M] and crashes!")
- playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75)
- playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75)
- DumpMobs(TRUE)
+ log_combat(src, hittarget_living, "sucked up")
+ return
+ if(!istype(bumped, /turf/closed))
+ return
+ visible_message(span_warning("[src] rams into [bumped] and crashes!"))
+ playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75)
+ playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75)
+ DumpMobs(TRUE)
+ log_combat(src, bumped, "crashed into", null, "dumping all passengers")
/obj/vehicle/sealed/car/clowncar/emag_act(mob/user)
. = ..()
if(obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
- to_chat(user, "You scramble the clowncar child safety lock and a panel with 6 colorful buttons appears!")
- initialize_controller_action_type(/datum/action/vehicle/sealed/RollTheDice, VEHICLE_CONTROL_DRIVE)
+ to_chat(user, span_danger("You scramble \the [src]'s child safety lock, and a panel with six colorful buttons appears!"))
+ initialize_controller_action_type(/datum/action/vehicle/sealed/roll_the_dice, VEHICLE_CONTROL_DRIVE)
+ initialize_controller_action_type(/datum/action/vehicle/sealed/cannon, VEHICLE_CONTROL_DRIVE)
return TRUE
-/obj/vehicle/sealed/car/clowncar/Destroy()
+/obj/vehicle/sealed/car/clowncar/obj_destruction(damage_flag)
playsound(src, 'sound/vehicles/clowncar_fart.ogg', 100)
+ STOP_PROCESSING(SSobj,src)
return ..()
-/obj/vehicle/sealed/car/clowncar/after_move(direction)
- . = ..()
- if(droppingoil)
- new /obj/effect/decal/cleanable/oil/slippery(loc)
-
-/obj/vehicle/sealed/car/clowncar/proc/RollTheDice(mob/user)
- if(world.time - lastRTDtime < RTDcooldown)
- to_chat(user, "The button panel is currently recharging.")
+/**
+ * Plays a random funky effect
+ * Only available while car is emagged
+ * Possible effects:
+ * * Spawn bananapeel
+ * * Spawn random reagent foam
+ * * Make the clown car look like a singulo temporarily
+ * * Spawn Laughing chem gas
+ * * Drop oil
+ * * Fart and make everyone nearby laugh
+ */
+/obj/vehicle/sealed/car/clowncar/proc/roll_the_dice(mob/user)
+ if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_CLOWNCAR_RANDOMNESS))
+ to_chat(user, span_notice("The button panel is currently recharging."))
return
- lastRTDtime = world.time
- var/randomnum = rand(1,6)
- switch(randomnum)
+ TIMER_COOLDOWN_START(src, COOLDOWN_CLOWNCAR_RANDOMNESS, dice_cooldown_time)
+ switch(rand(1,6))
if(1)
- visible_message("[user] has pressed one of the colorful buttons on [src] and a special banana peel drops out of it.")
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and a special banana peel drops out of it."))
new /obj/item/grown/bananapeel/specialpeel(loc)
if(2)
- visible_message("[user] has pressed one of the colorful buttons on [src] and unknown chemicals flood out of it.")
- var/datum/reagents/R = new/datum/reagents(300)
- R.my_atom = src
- R.add_reagent(get_random_reagent_id(), 100)
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it."))
+ var/datum/reagents/randomchems = new/datum/reagents(300)
+ randomchems.my_atom = src
+ randomchems.add_reagent(get_random_reagent_id(), 100)
var/datum/effect_system/foam_spread/foam = new
- foam.set_up(200, loc, R)
+ foam.set_up(200, loc, randomchems)
foam.start()
if(3)
- visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car turns on its singularity disguise system.")
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system."))
icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
- addtimer(CALLBACK(src, .proc/ResetIcon), 100)
+ addtimer(CALLBACK(src, .proc/reset_icon), 10 SECONDS)
if(4)
- visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car spews out a cloud of laughing gas.")
- var/datum/reagents/R = new/datum/reagents(300)
- R.my_atom = src
- R.add_reagent(/datum/reagent/consumable/superlaughter, 50)
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas."))
+ var/datum/reagents/funnychems = new/datum/reagents(300)
+ funnychems.my_atom = src
+ funnychems.add_reagent(/datum/reagent/consumable/superlaughter, 50)
var/datum/effect_system/smoke_spread/chem/smoke = new()
- smoke.set_up(R, 4)
+ smoke.set_up(funnychems, 4)
smoke.attach(src)
smoke.start()
if(5)
- visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car starts dropping an oil trail.")
- droppingoil = TRUE
- addtimer(CALLBACK(src, .proc/StopDroppingOil), 30)
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail."))
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/cover_in_oil)
+ addtimer(CALLBACK(src, .proc/stop_dropping_oil), 3 SECONDS)
if(6)
- visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car lets out a comedic toot.")
+ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car lets out a comedic toot."))
playsound(src, 'sound/vehicles/clowncar_fart.ogg', 100)
for(var/mob/living/L in orange(loc, 6))
L.emote("laughs")
- for(var/mob/living/L in occupants)
+ for(var/mob/living/L as anything in occupants)
L.emote("laughs")
-/obj/vehicle/sealed/car/clowncar/proc/ResetIcon()
+///resets the icon and iconstate of the clowncar after it was set to singulo states
+/obj/vehicle/sealed/car/clowncar/proc/reset_icon()
icon = initial(icon)
icon_state = initial(icon_state)
-/obj/vehicle/sealed/car/clowncar/proc/StopDroppingOil()
- droppingoil = FALSE
+///Deploys oil when the clowncar moves in oil deploy mode
+/obj/vehicle/sealed/car/clowncar/proc/cover_in_oil()
+ SIGNAL_HANDLER
+ new /obj/effect/decal/cleanable/oil/slippery(loc)
+
+///Stops dropping oil after the time has run up
+/obj/vehicle/sealed/car/clowncar/proc/stop_dropping_oil()
+ UnregisterSignal(src, COMSIG_MOVABLE_MOVED)
+
+///Toggles the on and off state of the clown cannon that shoots random kidnapped people
+/obj/vehicle/sealed/car/clowncar/proc/toggle_cannon(mob/user)
+ if(cannonmode == CLOWN_CANNON_BUSY)
+ to_chat(user, span_notice("Please wait for the vehicle to finish its current action first."))
+ return
+ if(cannonmode) //canon active, deactivate
+ flick("clowncar_fromfire", src)
+ icon_state = "clowncar"
+ addtimer(CALLBACK(src, .proc/deactivate_cannon), 2 SECONDS)
+ playsound(src, 'sound/vehicles/clowncar_cannonmode2.ogg', 75)
+ visible_message(span_danger("The [src] starts going back into mobile mode."))
+ else
+ canmove = FALSE //anchor and activate canon
+ flick("clowncar_tofire", src)
+ icon_state = "clowncar_fire"
+ visible_message(span_danger("The [src] opens up and reveals a large cannon."))
+ addtimer(CALLBACK(src, .proc/activate_cannon), 2 SECONDS)
+ playsound(src, 'sound/vehicles/clowncar_cannonmode1.ogg', 75)
+ cannonmode = CLOWN_CANNON_BUSY
+
+///Finalizes canon activation
+/obj/vehicle/sealed/car/clowncar/proc/activate_cannon()
+ // mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi'
+ cannonmode = CLOWN_CANNON_READY
+ for(var/mob/living/driver as anything in return_controllers_with_flag(VEHICLE_CONTROL_DRIVE))
+ driver.update_mouse_pointer()
+
+///Finalizes canon deactivation
+/obj/vehicle/sealed/car/clowncar/proc/deactivate_cannon()
+ canmove = TRUE
+ // mouse_pointer = null
+ cannonmode = CLOWN_CANNON_INACTIVE
+ for(var/mob/living/driver as anything in return_controllers_with_flag(VEHICLE_CONTROL_DRIVE))
+ driver.update_mouse_pointer()
+
+///Fires the cannon where the user clicks
+/obj/vehicle/sealed/car/clowncar/proc/fire_cannon_at(mob/user, atom/A, params)
+ SIGNAL_HANDLER
+ if(cannonmode != CLOWN_CANNON_READY || !length(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED)))
+ return NONE
+ var/mob/living/unlucky_sod = pick(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED))
+ mob_exit(unlucky_sod, TRUE)
+ flick("clowncar_recoil", src)
+ playsound(src, pick('sound/vehicles/carcannon1.ogg', 'sound/vehicles/carcannon2.ogg', 'sound/vehicles/carcannon3.ogg'), 75)
+ unlucky_sod.throw_at(A, 10, 2)
+ log_combat(user, unlucky_sod, "fired", src, "towards [A]") //this doesn't catch if the mob hits something between the car and the target
+ return COMSIG_MOB_CANCEL_CLICKON
+
+///Increments the thanks counter every time someone thats been kidnapped thanks the driver
+/obj/vehicle/sealed/car/clowncar/proc/increment_thanks_counter()
+ thankscount++
+ if(thankscount < 100)
+ return
+ for(var/mob/busdriver as anything in return_drivers())
+ busdriver.client.give_award(/datum/award/achievement/misc/the_best_driver, busdriver)
/obj/vehicle/sealed/car/clowncar/twitch_plays
key_type = null
@@ -144,12 +244,10 @@
/obj/vehicle/sealed/car/clowncar/twitch_plays/Initialize()
. = ..()
AddComponent(/datum/component/twitch_plays/simple_movement)
- START_PROCESSING(SSfastprocess, src)
GLOB.poi_list |= src
notify_ghosts("Twitch Plays: Clown Car")
/obj/vehicle/sealed/car/clowncar/twitch_plays/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
GLOB.poi_list -= src
return ..()
@@ -158,3 +256,4 @@
if(!dir)
return
driver_move(null, dir)
+ ..()
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index 5de2c8961f..8b2c72008c 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -126,44 +126,70 @@
desc = "Honk your classy horn."
button_icon_state = "car_horn"
var/hornsound = 'sound/items/carhorn.ogg'
- var/last_honk_time
/datum/action/vehicle/sealed/horn/Trigger()
- if(world.time - last_honk_time > 20)
- vehicle_entered_target.visible_message("[vehicle_entered_target] loudly honks")
- to_chat(owner, "You press the vehicle's horn.")
- playsound(vehicle_entered_target, hornsound, 75)
- last_honk_time = world.time
+ if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_CAR_HONK))
+ return
+ TIMER_COOLDOWN_START(src, COOLDOWN_CAR_HONK, 2 SECONDS)
+ vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] loudly honks!"))
+ to_chat(owner, span_notice("You press [vehicle_entered_target]'s horn."))
+ if(istype(vehicle_target.inserted_key, /obj/item/bikehorn))
+ vehicle_target.inserted_key.attack_self(owner) //The bikehorn plays a sound instead
+ return
+ playsound(vehicle_entered_target, hornsound, 75)
-/datum/action/vehicle/sealed/horn/clowncar/Trigger()
- if(world.time - last_honk_time > 20)
- vehicle_entered_target.visible_message("[vehicle_entered_target] loudly honks")
- to_chat(owner, "You press the vehicle's horn.")
- last_honk_time = world.time
- if(vehicle_target.inserted_key)
- vehicle_target.inserted_key.attack_self(owner) //The key plays a sound
- else
- playsound(vehicle_entered_target, hornsound, 75)
-
-/datum/action/vehicle/sealed/DumpKidnappedMobs
- name = "Dump kidnapped mobs"
+/datum/action/vehicle/sealed/dump_kidnapped_mobs
+ name = "Dump Kidnapped Mobs"
desc = "Dump all objects and people in your car on the floor."
button_icon_state = "car_dump"
-/datum/action/vehicle/sealed/DumpKidnappedMobs/Trigger()
- vehicle_entered_target.visible_message("[vehicle_entered_target] starts dumping the people inside of it.")
+/datum/action/vehicle/sealed/dump_kidnapped_mobs/Trigger()
+ vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] starts dumping the people inside of it."))
vehicle_entered_target.DumpSpecificMobs(VEHICLE_CONTROL_KIDNAPPED)
-/datum/action/vehicle/sealed/RollTheDice
- name = "Press a colorful button"
+/datum/action/vehicle/sealed/roll_the_dice
+ name = "Press Colorful Button"
desc = "Press one of those colorful buttons on your display panel!"
button_icon_state = "car_rtd"
-/datum/action/vehicle/sealed/RollTheDice/Trigger()
- if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar))
- var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target
- C.RollTheDice(owner)
+/datum/action/vehicle/sealed/roll_the_dice/Trigger()
+ if(!istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar))
+ return
+ var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target
+ C.roll_the_dice(owner)
+
+/datum/action/vehicle/sealed/cannon
+ name = "Toggle Siege Mode"
+ desc = "Destroy them with their own fodder!"
+ button_icon_state = "car_cannon"
+
+/datum/action/vehicle/sealed/cannon/Trigger()
+ if(!istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar))
+ return
+ var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target
+ C.toggle_cannon(owner)
+
+
+/datum/action/vehicle/sealed/thank
+ name = "Thank the Clown Car Driver"
+ desc = "They're just doing their job."
+ button_icon_state = "car_thanktheclown"
+ COOLDOWN_DECLARE(thank_time_cooldown)
+
+
+/datum/action/vehicle/sealed/thank/Trigger()
+ if(!istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar))
+ return
+ if(!COOLDOWN_FINISHED(src, thank_time_cooldown))
+ return
+ COOLDOWN_START(src, thank_time_cooldown, 6 SECONDS)
+ var/obj/vehicle/sealed/car/clowncar/clown_car = vehicle_entered_target
+ var/mob/living/carbon/human/clown = pick(clown_car.return_drivers())
+ if(!clown)
+ return
+ owner.say("Thank you for the fun ride, [clown.name]!")
+ clown_car.increment_thanks_counter()
/datum/action/vehicle/ridden/scooter/skateboard/ollie
@@ -197,7 +223,9 @@
L.Move(landing_turf, vehicle_target.dir)
passtable_off(L, VEHICLE_TRAIT)
V.pass_flags &= ~PASSTABLE
- if(locate(/obj/structure/table) in V.loc.contents)
+ if((locate(/obj/structure/table) in V.loc.contents) || (locate(/obj/structure/fluff/railing) in V.loc.contents))
+ if(locate(/obj/structure/fluff/railing) in V.loc.contents)
+ L.client.give_award(/datum/award/achievement/misc/tram_surfer, L)
V.grinding = TRUE
V.icon_state = "[V.board_icon]-grind"
addtimer(CALLBACK(V, /obj/vehicle/ridden/scooter/skateboard/.proc/grind), 2)
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 6adc9d38e6..8822ef2ff0 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -15,9 +15,9 @@
/obj/item/clothing/glasses/monocle = 3,
/obj/item/clothing/suit/jacket = 4,
/obj/item/clothing/suit/jacket/flannel = 4,
- /obj/item/clothing/suit/jacket/flannel/red = 4,
- /obj/item/clothing/suit/jacket/flannel/aqua = 4,
- /obj/item/clothing/suit/jacket/flannel/brown = 4,
+ /obj/item/clothing/suit/toggle/jacket/flannel/red = 4,
+ /obj/item/clothing/suit/toggle/jacket/flannel/aqua = 4,
+ /obj/item/clothing/suit/toggle/jacket/flannel/brown = 4,
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
@@ -219,7 +219,17 @@
/obj/item/clothing/under/misc/corporateuniform = 5,
/obj/item/clothing/suit/hooded/wintercoat/polychromic = 5,
/obj/item/clothing/suit/toggle/wbreakpoly/polychromic = 5,
- /obj/item/clothing/shoes/sneakers/poly/polychromic = 10)
+ /obj/item/clothing/shoes/sneakers/poly/polychromic = 10,
+ /obj/item/clothing/suit/toggle/jacket/fancytrench = 4,
+ /obj/item/clothing/suit/toggle/jacket/greenjacket = 4,
+ /obj/item/clothing/suit/jacket/gentlecoat = 4,
+ /obj/item/clothing/suit/jacket/gothicshirtcross = 4,
+ /obj/item/clothing/suit/jacket/gothicshirt = 4,
+ /obj/item/clothing/suit/jacket/gothiccoat = 4,
+ /obj/item/clothing/suit/jacket/heartcoat = 4,
+ /obj/item/clothing/suit/jacket/purplehoodie = 4,
+ /obj/item/clothing/suit/jacket/bluehoodie = 4,
+ /obj/item/clothing/suit/toggle/jacket/whitehoodie = 4)
refill_canister = /obj/item/vending_refill/clothing
default_price = PRICE_CHEAP
extra_price = PRICE_BELOW_NORMAL
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index a1d9bc1691..7664a191c8 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -10,7 +10,9 @@
/obj/item/toy/cards/deck/unum = 3,
/obj/item/cardpack/series_one = 10,
/obj/item/dyespray=3,
- /obj/item/tcgcard_binder = 5)
+ /obj/item/tcgcard_binder = 5,
+ /obj/item/canvas = 3,
+ /obj/item/toy/crayon/spraycan = 3)
contraband = list(/obj/item/dice/fudge = 9)
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt
index 969e4135f6..c62408b90c 100644
--- a/config/spaceRuinBlacklist.txt
+++ b/config/spaceRuinBlacklist.txt
@@ -53,3 +53,4 @@
#_maps/RandomRuins/SpaceRuins/spacehermit.dmm
#_maps/RandomRuins/SpaceRuins/advancedlab.dmm
#_maps/RandomRuins/SpaceRuins/spacediner.dmm
+#_maps/RandomRuins/SpaceRuins/skelter.dmm
diff --git a/html/changelog.html b/html/changelog.html
index dabd4e7704..8a0b3baf6d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,165 @@
-->
+
30 September 2021
+
Hatterhat updated:
+
+
The xenomorph infestation on Moon Outpost 19 is significantly less prone to outbreaks, theoretically.
+
+
Putnam3145 updated:
+
+
Minesweeper's "play on same board"
+
+
+
29 September 2021
+
Ghommie updated:
+
+
Animals are no loner n(e)igh-immune to stuttering.
+
Silicons and animals won't keep stuttering or slurring forever after being struck by something that made them like that in the first place (such as a Blue Space Artillery).
+
+
Hatterhat updated:
+
+
Reports from other stations' Wardens blasting themselves in sensitive places due to mishandled firearms has led to the introduction of a folding-stock safety for their shotgun, rendering it inoperable while the stock is folded.
+
Compact combat shotguns now stay compact when stored, by virtue of being unable to be extended while in a bag.
+
Reloading a shotgun with a shell clip now inflicts melee click delay.
+
+
LetterN updated:
+
+
clowncar railgun- i mean gun
+
more achivements
+
syndie carp can pick up the disky (and is smart now)
+
hooks most of the achivements, all of the heretics work now
+
+
Putnam3145 updated:
+
+
Lavaland can no longer be too cold for its natives to surivive
+
+
buffyuwu updated:
+
+
flannels can now be toggled in style from buttoned to unbuttoned
+
ports more rp and existing tg assets with minor edits into loadout selection
+
+
keronshb updated:
+
+
Ninja status back in the status menu
+
+
zeroisthebiggay updated:
+
+
the monkey shuttle brig
+
meta gets a prison
+
the floating fire extinguisher
+
fucks the motivation's cost.
+
a new maintenance ambience
+
+
+
28 September 2021
+
zeroisthebiggay updated:
+
+
helter skelter loot insanity
+
helter skelter comms insanity
+
+
+
27 September 2021
+
zeroisthebiggay updated:
+
+
helter skelter actually spawns
+
code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
+
+
+
25 September 2021
+
buffyuwu updated:
+
+
fixes accordions
+
+
+
24 September 2021
+
zeroisthebiggay updated:
+
+
gremlins become shock immune
+
+
+
23 September 2021
+
KrabSpider updated:
+
+
cryogenics ain't a candidate for anomaly spawns anymore.
+
+
buffyuwu updated:
+
+
canvas and spray can are now sold in the fun vendor
+
+
+
22 September 2021
+
silicons updated:
+
+
dice bags can only hold dice
+
limb damage changes reverted
+
crawling can't be adrenals'd
+
+
+
20 September 2021
+
BlueWildrose updated:
+
+
Slime regenerative extracts now require five seconds of wait before they are used. They add 25 disgust when used.
+
+
DeltaFire15 updated:
+
+
Catsurgeons should now spawn at more reasonable locations if possible.
+
carded AIs can now be converted by conversion sigils (clockcult)
+
There is now a way to acquire nanite storage protocols (bepis, like the other protocols), as opposed to them existing with no way to acquire them.
+
Plastic golems are back to ventcrawler_nude instead of ventcrawler_always
+
+
Putnam3145 updated:
+
+
monstermos config added, disabled
+
+
buffyuwu updated:
+
+
fixed medihound sleeper ui display
+
Adds 4 redesigned jackets and 2 redesigned shirts to loadout
+
Holoparasites no long rename and recolor on relog
+
+
dapnee updated:
+
+
attaches an air vent that was just there on the AI sat, changes some areas to what they'd logically be
+
+
keronshb updated:
+
+
Plague Rats will no longer spawn thousands of dirt decals
+
Plague Rats will no longer spawn thousands of corpses
+
Plague Rats can't spawn or transform off station z anymore
+
Plague Rats shouldn't explosively grow instantly
+
Plague Rats won't spawn infinite miasma anymore.
+
Plague Rats health is now 100.
+
Plague Rats can now ventcrawl through everything to prevent farming.
+
Slaughter Demons Slam will now wound again on hit.
+
Damage for demons back up to 30
+
Wound Bonus for demons now at 0. image_add: Adds a sprite for the action bar
+
Changed the CTRL+SHIFT Click to an action button. People can see the cooldown now too.
+
PAIs can be emagged to reset master
+
+
qweq12yt updated:
+
+
Fixed space heaters not being able to be interacted/turned on in non powered areas
+
+
timothyteakettle updated:
+
+
removes passkey from access circuits as its not used anymore
+
a new mild trauma, **[REDACTED]**
+
+
zeroisthebiggay updated:
+
+
glass has do_after
+
box perma has power
+
missing madness mask sprites
+
The Spider Clan has recently taken up the Space Ninja project again along with the Syndicate. Space Ninjas have been drastically changed as a result, becoming much weaker and more stealth oriented. As a result of cutting costs per ninja, more ninjas were able to be hired. Expect to see them around more often.
+
prisoners cannot latejoin anymore
+
bone satchel onmob sprites
+
new tips
+
old tips
+
all medipens get inhands
+
some more brainhurt lines
+
+
18 September 2021
kiwedespars updated:
@@ -382,134 +541,6 @@
organs decay again
-
-
04 August 2021
-
BlueWildrose updated:
-
-
The debrained overlay actually shows for brainless corpses now instead of showing a blue error.
-
-
timothyteakettle updated:
-
-
legs are no longer awful
-
-
-
03 August 2021
-
zeroisthebiggay updated:
-
-
tempgun is a laser
-
bake mode is useful
-
tempgun has less shots
-
tempgun has more sprites
-
-
-
02 August 2021
-
TripleShades updated:
-
-
Decorative (read: Station-safe) water tile in the code
-
Pubby's new water feature wont kill atmosphere anymore
-
-
-
31 July 2021
-
MrJWhit updated:
-
-
Fixes some minor mistakes around space near boxstation.
-
-
TripleShades updated:
-
-
Fountain area to public mining station-side tweak: Moved around the tables and chairs and monitor at public mining station-side
-
-
WanderingFox95 updated:
-
-
Added new ruin maps: The Bathhouse, The Library, The Engineering outpost, The Hotsprings(un-cursed), Lust, Wrath and an alternate spawn for the BDM in the form of a mining outpost, based on the same Ruins on the Ice Moon. removed: A lot of the fun items within the ice moon-based ruins that would break mining even more and trading cards.
-
Yes, this includes that the lavaland version of the hot spring is literally just water and not cursed. tweak: Also "fixed" that only one version of the BDM ruin ever spawns. Not sure it needed fixing but even locally hosted, only blooddrunk2.dmm would spawn. Since I added another spawn for the BDM, I fixed that too.
-
-
-
29 July 2021
-
EmeraldSundisk updated:
-
-
Adds decals between Virology and the general Medbay to provide clarity
-
Adds an airlock with access to the Engineering Cooling Loop
-
The Maintenance Theater now has a suitable amount of dust
-
Removed an errant entertainment monitor left in the morgue
-
Removed redundant scrubber piping in and around the bar and kitchen tweak: Slightly readjusts an airpipe to take advantage of newfound space tweak: The Toxins Lab has received (predominantly) visual adjustments as to render it more in line with the general science department tweak: Toxins Storage is no longer its own area and as such needn't worry about APCs
-
Hydroponics now has a proper APC as intended
-
-
-
27 July 2021
-
Putnam3145 updated:
-
-
Generic fires work now
-
A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful
-
-
-
26 July 2021
-
SandPoot updated:
-
-
Removes a sneaky transform button on the vore panel.
-
-
-
24 July 2021
-
MrJWhit updated:
-
-
Replaces the northwest maint room on box with a sadness room
-
Replaces bar stripper room with an arcade on boxstation
-
Squished the west bathrooms a bit and made a room to sell things on boxstation.
-
Southeast maint hallway on box is now ziggy and zaggier.
-
Fixed pipes being not connected with the recent map PR for boxstation.
-
-
Putnam3145 updated:
-
-
hallucination now bottoms out at 0
-
supermatter now causes only half the hallucinations
-
-
cadyn updated:
-
-
auxmos bump for dependencies.sh
-
-
-
23 July 2021
-
silicons updated:
-
-
Batons are slightly more powerful.
-
-
-
19 July 2021
-
Arturlang updated:
-
-
The crafting button should no longer silently make more copies of itself on reconects
-
There are no longer two copies of the crafting component.
-
There is no longer a rogue d in tracer.dm tweak: Everything in Misc was moved to Miscelanious in the crafting menu, and Misc was nuked from orbit. Nobody will miss you.
-
-
MrJWhit updated:
-
-
Fixes a memory leak, there's a good chance that it's the same one that killed kilo.
-
-
SandPoot updated:
-
-
Put back mob vore with a pref.
-
Taken some stuff from tg for tgui_alert.
-
Refactored a lot of code on vore panel.
-
-
WanderingFox95 updated:
-
-
custom plasteel kegs
-
-
YakumoChen updated:
-
-
You can now wear the suffering of others on your head with just a sheet of human skin!
-
Human skin hats
-
-
keronshb updated:
-
-
Stripping/equipping things to a conscious braindead person (AKA a human owned by a disconnected player) will now give them a message with your visible name and roughly how long ago you touched their stuff when they login again. Touching someone's pockets or adjusting their gear other than equipping/unequipping is not logged. After 5 minutes, you'll have forgotten both their name and exactly how long ago past those 5 minutes it happened. (Credit to Ryll-Ryll)
-
LAZYNULL
-
Breaking mirrors now gives you a bad omen
-
-
timothyteakettle updated:
-
-
anthros can now select the cow tail
-
new quirk that allows you to eat trash
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e4e1fba1c6..3bce254157 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -30003,3 +30003,120 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2021-09-18:
kiwedespars:
- balance: blacklisted morphine and haloperidol from dart guns
+2021-09-20:
+ BlueWildrose:
+ - balance: Slime regenerative extracts now require five seconds of wait before they
+ are used. They add 25 disgust when used.
+ DeltaFire15:
+ - bugfix: Catsurgeons should now spawn at more reasonable locations if possible.
+ - balance: carded AIs can now be converted by conversion sigils (clockcult)
+ - bugfix: There is now a way to acquire nanite storage protocols (bepis, like the
+ other protocols), as opposed to them existing with no way to acquire them.
+ - bugfix: Plastic golems are back to ventcrawler_nude instead of ventcrawler_always
+ Putnam3145:
+ - config: monstermos config added, disabled
+ buffyuwu:
+ - bugfix: fixed medihound sleeper ui display
+ - rscadd: Adds 4 redesigned jackets and 2 redesigned shirts to loadout
+ - bugfix: Holoparasites no long rename and recolor on relog
+ dapnee:
+ - bugfix: attaches an air vent that was just there on the AI sat, changes some areas
+ to what they'd logically be
+ keronshb:
+ - bugfix: Plague Rats will no longer spawn thousands of dirt decals
+ - bugfix: Plague Rats will no longer spawn thousands of corpses
+ - bugfix: Plague Rats can't spawn or transform off station z anymore
+ - bugfix: Plague Rats shouldn't explosively grow instantly
+ - bugfix: Plague Rats won't spawn infinite miasma anymore.
+ - balance: Plague Rats health is now 100.
+ - balance: Plague Rats can now ventcrawl through everything to prevent farming.
+ - bugfix: Slaughter Demons Slam will now wound again on hit.
+ - balance: Damage for demons back up to 30
+ - balance: 'Wound Bonus for demons now at 0. image_add: Adds a sprite for the action
+ bar'
+ - refactor: Changed the CTRL+SHIFT Click to an action button. People can see the
+ cooldown now too.
+ - rscadd: PAIs can be emagged to reset master
+ qweq12yt:
+ - bugfix: Fixed space heaters not being able to be interacted/turned on in non powered
+ areas
+ timothyteakettle:
+ - bugfix: removes passkey from access circuits as its not used anymore
+ - rscadd: a new mild trauma, **[REDACTED]**
+ zeroisthebiggay:
+ - balance: glass has do_after
+ - bugfix: box perma has power
+ - bugfix: missing madness mask sprites
+ - balance: The Spider Clan has recently taken up the Space Ninja project again along
+ with the Syndicate. Space Ninjas have been drastically changed as a result,
+ becoming much weaker and more stealth oriented. As a result of cutting costs
+ per ninja, more ninjas were able to be hired. Expect to see them around more
+ often.
+ - bugfix: prisoners cannot latejoin anymore
+ - bugfix: bone satchel onmob sprites
+ - rscadd: new tips
+ - rscdel: old tips
+ - imageadd: all medipens get inhands
+ - rscadd: some more brainhurt lines
+2021-09-22:
+ silicons:
+ - bugfix: dice bags can only hold dice
+ - rscdel: limb damage changes reverted
+ - bugfix: crawling can't be adrenals'd
+2021-09-23:
+ KrabSpider:
+ - code_imp: cryogenics ain't a candidate for anomaly spawns anymore.
+ buffyuwu:
+ - rscadd: canvas and spray can are now sold in the fun vendor
+2021-09-24:
+ zeroisthebiggay:
+ - balance: gremlins become shock immune
+2021-09-25:
+ buffyuwu:
+ - bugfix: fixes accordions
+2021-09-27:
+ zeroisthebiggay:
+ - bugfix: helter skelter actually spawns
+ - bugfix: 'code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning:
+ newmouse: variable defined but not used'
+2021-09-28:
+ zeroisthebiggay:
+ - balance: helter skelter loot insanity
+ - bugfix: helter skelter comms insanity
+2021-09-29:
+ Ghommie:
+ - rscdel: Animals are no loner n(e)igh-immune to stuttering.
+ - bugfix: Silicons and animals won't keep stuttering or slurring forever after being
+ struck by something that made them like that in the first place (such as a Blue
+ Space Artillery).
+ Hatterhat:
+ - balance: Reports from other stations' Wardens blasting themselves in sensitive
+ places due to mishandled firearms has led to the introduction of a folding-stock
+ safety for their shotgun, rendering it inoperable while the stock is folded.
+ - balance: Compact combat shotguns now stay compact when stored, by virtue of being
+ unable to be extended while in a bag.
+ - balance: Reloading a shotgun with a shell clip now inflicts melee click delay.
+ LetterN:
+ - rscadd: clowncar railgun- i mean gun
+ - rscadd: more achivements
+ - rscadd: syndie carp can pick up the disky (and is smart now)
+ - code_imp: hooks most of the achivements, all of the heretics work now
+ Putnam3145:
+ - bugfix: Lavaland can no longer be too cold for its natives to surivive
+ buffyuwu:
+ - bugfix: flannels can now be toggled in style from buttoned to unbuttoned
+ - rscadd: ports more rp and existing tg assets with minor edits into loadout selection
+ keronshb:
+ - refactor: Ninja status back in the status menu
+ zeroisthebiggay:
+ - bugfix: the monkey shuttle brig
+ - rscadd: meta gets a prison
+ - bugfix: the floating fire extinguisher
+ - balance: fucks the motivation's cost.
+ - soundadd: a new maintenance ambience
+2021-09-30:
+ Hatterhat:
+ - rscdel: The xenomorph infestation on Moon Outpost 19 is significantly less prone
+ to outbreaks, theoretically.
+ Putnam3145:
+ - rscdel: Minesweeper's "play on same board"
diff --git a/html/changelogs/AutoChangeLog-pr-14219.yml b/html/changelogs/AutoChangeLog-pr-14219.yml
deleted file mode 100644
index 1bef269e5a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14219.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - balance: "The Spider Clan has recently taken up the Space Ninja project again along with the Syndicate. Space Ninjas have been drastically changed as a result, becoming much weaker and more stealth oriented. As a result of cutting costs per ninja, more ninjas were able to be hired. Expect to see them around more often."
diff --git a/html/changelogs/AutoChangeLog-pr-15074.yml b/html/changelogs/AutoChangeLog-pr-15074.yml
deleted file mode 100644
index 5da0c10a10..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15074.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "PAIs can be emagged to reset master"
diff --git a/html/changelogs/AutoChangeLog-pr-15084.yml b/html/changelogs/AutoChangeLog-pr-15084.yml
deleted file mode 100644
index 6c99cc159d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15084.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "Plague Rats will no longer spawn thousands of dirt decals"
- - bugfix: "Plague Rats will no longer spawn thousands of corpses"
- - bugfix: "Plague Rats can't spawn or transform off station z anymore"
- - bugfix: "Plague Rats shouldn't explosively grow instantly"
- - bugfix: "Plague Rats won't spawn infinite miasma anymore."
- - balance: "Plague Rats health is now 100."
- - balance: "Plague Rats can now ventcrawl through everything to prevent farming."
diff --git a/html/changelogs/AutoChangeLog-pr-15094.yml b/html/changelogs/AutoChangeLog-pr-15094.yml
deleted file mode 100644
index 21dcf75960..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15094.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - balance: "glass has do_after"
diff --git a/html/changelogs/AutoChangeLog-pr-15119.yml b/html/changelogs/AutoChangeLog-pr-15119.yml
deleted file mode 100644
index ee7100fd9b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15119.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "Slaughter Demons Slam will now wound again on hit."
- - balance: "Damage for demons back up to 30"
- - balance: "Wound Bonus for demons now at 0.
-image_add: Adds a sprite for the action bar"
- - refactor: "Changed the CTRL+SHIFT Click to an action button. People can see the cooldown now too."
diff --git a/html/changelogs/AutoChangeLog-pr-15133.yml b/html/changelogs/AutoChangeLog-pr-15133.yml
deleted file mode 100644
index 3bc023735f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15133.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "new tips"
- - rscdel: "old tips"
diff --git a/html/changelogs/AutoChangeLog-pr-15134.yml b/html/changelogs/AutoChangeLog-pr-15134.yml
deleted file mode 100644
index 2a71bd9aa0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15134.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "some more brainhurt lines"
diff --git a/html/changelogs/AutoChangeLog-pr-15137.yml b/html/changelogs/AutoChangeLog-pr-15137.yml
deleted file mode 100644
index eef278a6ea..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15137.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "carded AIs can now be converted by conversion sigils (clockcult)"
diff --git a/html/changelogs/AutoChangeLog-pr-15139.yml b/html/changelogs/AutoChangeLog-pr-15139.yml
deleted file mode 100644
index 001897e223..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15139.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Catsurgeons should now spawn at more reasonable locations if possible."
diff --git a/html/changelogs/AutoChangeLog-pr-15143.yml b/html/changelogs/AutoChangeLog-pr-15143.yml
deleted file mode 100644
index d4e2141937..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15143.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "box perma has power"
diff --git a/html/changelogs/AutoChangeLog-pr-15144.yml b/html/changelogs/AutoChangeLog-pr-15144.yml
deleted file mode 100644
index 860f1a60cc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15144.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "bone satchel onmob sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-15147.yml b/html/changelogs/AutoChangeLog-pr-15147.yml
deleted file mode 100644
index 09f98404fd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15147.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - config: "monstermos config added, disabled"
diff --git a/html/changelogs/AutoChangeLog-pr-15154.yml b/html/changelogs/AutoChangeLog-pr-15154.yml
deleted file mode 100644
index 756cc2bfb7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15154.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "qweq12yt"
-delete-after: True
-changes:
- - bugfix: "Fixed space heaters not being able to be interacted/turned on in non powered areas"
diff --git a/html/changelogs/AutoChangeLog-pr-15156.yml b/html/changelogs/AutoChangeLog-pr-15156.yml
deleted file mode 100644
index 4d74820ca3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15156.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "missing madness mask sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-15157.yml b/html/changelogs/AutoChangeLog-pr-15157.yml
deleted file mode 100644
index b3f0b8eaba..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15157.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "There is now a way to acquire nanite storage protocols (bepis, like the other protocols), as opposed to them existing with no way to acquire them."
diff --git a/html/changelogs/AutoChangeLog-pr-15160.yml b/html/changelogs/AutoChangeLog-pr-15160.yml
deleted file mode 100644
index da0d68f52f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15160.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "removes passkey from access circuits as its not used anymore"
diff --git a/html/changelogs/AutoChangeLog-pr-15162.yml b/html/changelogs/AutoChangeLog-pr-15162.yml
deleted file mode 100644
index 926f0898d1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15162.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "prisoners cannot latejoin anymore"
diff --git a/html/changelogs/AutoChangeLog-pr-15163.yml b/html/changelogs/AutoChangeLog-pr-15163.yml
deleted file mode 100644
index 3fe5ba69ee..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15163.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "buffyuwu"
-delete-after: True
-changes:
- - rscadd: "Adds 4 redesigned jackets and 2 redesigned shirts to loadout"
diff --git a/html/changelogs/AutoChangeLog-pr-15167.yml b/html/changelogs/AutoChangeLog-pr-15167.yml
deleted file mode 100644
index 1c13dfc56f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15167.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - balance: "Slime regenerative extracts now require five seconds of wait before they are used. They add 25 disgust when used."
diff --git a/html/changelogs/AutoChangeLog-pr-15168.yml b/html/changelogs/AutoChangeLog-pr-15168.yml
deleted file mode 100644
index 4f040b4580..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15168.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes:
- - bugfix: "attaches an air vent that was just there on the AI sat, changes some areas to what they'd logically be"
diff --git a/html/changelogs/AutoChangeLog-pr-15169.yml b/html/changelogs/AutoChangeLog-pr-15169.yml
deleted file mode 100644
index f3af23ac39..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15169.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "a new mild trauma, **[REDACTED]**"
diff --git a/html/changelogs/AutoChangeLog-pr-15171.yml b/html/changelogs/AutoChangeLog-pr-15171.yml
deleted file mode 100644
index 958d61e87c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15171.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Plastic golems are back to ventcrawler_nude instead of ventcrawler_always"
diff --git a/html/changelogs/AutoChangeLog-pr-15174.yml b/html/changelogs/AutoChangeLog-pr-15174.yml
deleted file mode 100644
index 79b3b9400f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15174.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "buffyuwu"
-delete-after: True
-changes:
- - bugfix: "Holoparasites no long rename and recolor on relog"
diff --git a/html/changelogs/AutoChangeLog-pr-15176.yml b/html/changelogs/AutoChangeLog-pr-15176.yml
deleted file mode 100644
index 3335997a85..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15176.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "buffyuwu"
-delete-after: True
-changes:
- - bugfix: "fixed medihound sleeper ui display"
diff --git a/html/changelogs/AutoChangeLog-pr-15178.yml b/html/changelogs/AutoChangeLog-pr-15178.yml
deleted file mode 100644
index 3f4debbc45..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15178.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - imageadd: "all medipens get inhands"
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 28f28edaca..38f1d8e0af 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 48759bf81c..c3502badc9 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/inhands/weapons/hammers_lefthand.dmi b/icons/mob/inhands/weapons/hammers_lefthand.dmi
index 023dfeed89..988d64fde3 100644
Binary files a/icons/mob/inhands/weapons/hammers_lefthand.dmi and b/icons/mob/inhands/weapons/hammers_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/hammers_righthand.dmi b/icons/mob/inhands/weapons/hammers_righthand.dmi
index f87d8c9b46..1e0e7c91bf 100644
Binary files a/icons/mob/inhands/weapons/hammers_righthand.dmi and b/icons/mob/inhands/weapons/hammers_righthand.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index ab6cea5a3b..8e60dc7066 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index b84b195d14..f70f110078 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 58ba5fadd8..0f1ec3712d 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index 92d94a41e8..066bcf14c7 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -27,22 +27,22 @@
/datum/gear/suit/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack
name = "Black flannel jacket"
- path = /obj/item/clothing/suit/jacket/flannel
+ path = /obj/item/clothing/suit/toggle/jacket/flannel
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelred
name = "Red flannel jacket"
- path = /obj/item/clothing/suit/jacket/flannel/red
+ path = /obj/item/clothing/suit/toggle/jacket/flannel/red
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelaqua
name = "Aqua flannel jacket"
- path = /obj/item/clothing/suit/jacket/flannel/aqua
+ path = /obj/item/clothing/suit/toggle/jacket/flannel/aqua
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelbrown
name = "Brown flannel jacket"
- path = /obj/item/clothing/suit/jacket/flannel/brown
+ path = /obj/item/clothing/suit/toggle/jacket/flannel/brown
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketleather
@@ -97,6 +97,12 @@
name = "Brass winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake
+/datum/gear/suit/whitehoodie
+ name = "Soft hoodie"
+ path = /obj/item/clothing/suit/toggle/jacket/whitehoodie
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
+
/datum/gear/suit/jacketbluehoodie
name = "Blue hoodie"
path = /obj/item/clothing/suit/jacket/bluehoodie
@@ -132,6 +138,25 @@
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
+/datum/gear/suit/gentlecoat
+ name = "Grey coat"
+ path = /obj/item/clothing/suit/jacket/gentlecoat
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
+
+/datum/gear/suit/greenjacket
+ name = "Green outdoorsman jacket"
+ path = /obj/item/clothing/suit/toggle/jacket/greenjacket
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
+
+/datum/gear/suit/fancytrench
+ name = "Grey trenchcoat"
+ path = /obj/item/clothing/suit/toggle/jacket/fancytrench
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
+
+
/datum/gear/suit/coat/polycoat
name = "Polychromic winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/polychromic
diff --git a/sound/ambience/ambimaint10.ogg b/sound/ambience/ambimaint10.ogg
new file mode 100644
index 0000000000..769f95f93d
Binary files /dev/null and b/sound/ambience/ambimaint10.ogg differ
diff --git a/sound/vehicles/carcannon1.ogg b/sound/vehicles/carcannon1.ogg
new file mode 100644
index 0000000000..751fa6f754
Binary files /dev/null and b/sound/vehicles/carcannon1.ogg differ
diff --git a/sound/vehicles/carcannon2.ogg b/sound/vehicles/carcannon2.ogg
new file mode 100644
index 0000000000..7bc86d7cbc
Binary files /dev/null and b/sound/vehicles/carcannon2.ogg differ
diff --git a/sound/vehicles/carcannon3.ogg b/sound/vehicles/carcannon3.ogg
new file mode 100644
index 0000000000..80407e553f
Binary files /dev/null and b/sound/vehicles/carcannon3.ogg differ
diff --git a/sound/vehicles/clowncar_cannonmode1.ogg b/sound/vehicles/clowncar_cannonmode1.ogg
new file mode 100644
index 0000000000..aa21c8f990
Binary files /dev/null and b/sound/vehicles/clowncar_cannonmode1.ogg differ
diff --git a/sound/vehicles/clowncar_cannonmode2.ogg b/sound/vehicles/clowncar_cannonmode2.ogg
new file mode 100644
index 0000000000..931e146422
Binary files /dev/null and b/sound/vehicles/clowncar_cannonmode2.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 204b69a11b..86814261c5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -458,6 +458,8 @@
#include "code\datums\achievements\_awards.dm"
#include "code\datums\achievements\boss_achievements.dm"
#include "code\datums\achievements\boss_scores.dm"
+#include "code\datums\achievements\job_achievements.dm"
+#include "code\datums\achievements\job_scores.dm"
#include "code\datums\achievements\mafia_achievements.dm"
#include "code\datums\achievements\misc_achievements.dm"
#include "code\datums\achievements\misc_scores.dm"
@@ -1759,8 +1761,8 @@
#include "code\modules\antagonists\slaughter\slaughter.dm"
#include "code\modules\antagonists\slaughter\slaughter_antag.dm"
#include "code\modules\antagonists\slaughter\slaughterevent.dm"
-#include "code\modules\antagonists\space_ninja\space_ninja.dm"
#include "code\modules\antagonists\space_dragon\space_dragon.dm"
+#include "code\modules\antagonists\space_ninja\space_ninja.dm"
#include "code\modules\antagonists\survivalist\survivalist.dm"
#include "code\modules\antagonists\swarmer\swarmer.dm"
#include "code\modules\antagonists\swarmer\swarmer_event.dm"
@@ -2132,8 +2134,8 @@
#include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\sentience.dm"
#include "code\modules\events\shuttle_loan.dm"
-#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\space_dragon.dm"
+#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm"
diff --git a/tgui/packages/tgui/interfaces/Colormate.js b/tgui/packages/tgui/interfaces/Colormate.js
new file mode 100644
index 0000000000..f376547102
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Colormate.js
@@ -0,0 +1,286 @@
+import { useBackend } from '../backend';
+import { Button, Flex, Icon, NoticeBox, NumberInput, Section, Tabs } from '../components';
+import { Window } from '../layouts';
+
+export const Colormate = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { matrixactive, temp } = data;
+ const item = data.item || [];
+ return (
+
+
+ {temp ? (
+ {temp}
+ ) : (null)}
+ {Object.keys(item).length ? (
+ <>
+
+
+