" //When we need to revert to the main menu we set web as this
- web = static_web
-
- if(CHECK_BITFIELD(obj_flags, EMAGGED))
- web = "
Minesweeper EXTREME EDITION: Iteration #[randomnumber]" //Different colour mix for every random number made
- if(!spark_spam)
- do_sparks(5, 1, src)
- spark_spam = TRUE
- addtimer(CALLBACK(src, .proc/reset_spark_spam), 30)
-
-
- var/startup_sound = CHECK_BITFIELD(obj_flags, EMAGGED) ? 'sound/arcade/minesweeper_emag2.ogg' : 'sound/arcade/minesweeper_startup.ogg'
-
- if(href_list["Main_Menu"])
- game_status = MINESWEEPER_GAME_MAIN_MENU
- mine_limit = 0
- rows = 0
- columns = 0
- mine_placed = 0
- if(href_list["Easy"])
- playsound(loc, startup_sound, 10, 0, extrarange = -3, falloff = 10)
- flag_text = "OFF"
- game_status = MINESWEEPER_GAME_PLAYING
- reset_board = TRUE
- difficulty = "Easy"
- rows = 10 //9x9 board
- columns = 10
- mine_limit = 10
- if(href_list["Intermediate"])
- playsound(loc, startup_sound, 10, 0, extrarange = -3, falloff = 10)
- flag_text = "OFF"
- game_status = MINESWEEPER_GAME_PLAYING
- reset_board = TRUE
- difficulty = "Intermediate"
- rows = 17 //16x16 board
- columns = 17
- mine_limit = 40
- if(href_list["Hard"])
- playsound(loc, startup_sound, 10, 0, extrarange = -3, falloff = 10)
- flag_text = "OFF"
- game_status = MINESWEEPER_GAME_PLAYING
- reset_board = TRUE
- difficulty = "Hard"
- rows = 17 //16x30 board
- columns = 31
- mine_limit = 99
- if(href_list["Custom"])
- if(custom_generation(usr))
- flag_text = "OFF"
- game_status = MINESWEEPER_GAME_PLAYING
- reset_board = TRUE
- difficulty = "Custom"
- playsound(loc, startup_sound, 10, 0, extrarange = -3, falloff = 10)
- if(href_list["Flag"])
- playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
- if(!flagging)
- flagging = TRUE
- flag_text = "ON"
- else
- flagging = FALSE
- flag_text = "OFF"
-
- if(game_status == MINESWEEPER_GAME_MAIN_MENU)
- if(CHECK_BITFIELD(obj_flags, EMAGGED))
- playsound(loc, 'sound/arcade/minesweeper_emag2.ogg', 10, 0, extrarange = -3, falloff = 10)
- web += "
Explode in the game, explode in real life!
What difficulty do you want to play?
Easy (9x9 board, 10 mines)
Intermediate (16x16 board, 40 mines)
Hard (16x30 board, 99 mines)
Custom"
- else
- playsound(loc, 'sound/arcade/minesweeper_startup.ogg', 10, 0, extrarange = -3, falloff = 10)
- web += web_difficulty_menu
-
- if(game_status == MINESWEEPER_GAME_PLAYING)
- mine_sound = TRUE
-
- area = (rows-1)*(columns-1)
-
- if(reset_board)
- mine_placed = 0
- var/reset_everything = TRUE
- make_mines(reset_everything)
-
- safe_squares_revealed = 0
- win_condition = area-mine_placed
-
- if(game_status != MINESWEEPER_GAME_MAIN_MENU)
- for(var/y1=1;y1= 0) //Check that it's not already revealed, and stop flag removal if we're out of flag mode
- table[y1][x1] += 10
- if(table[y1][x1] != 10)
- playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
- else
- if(game_status != MINESWEEPER_GAME_LOST && game_status != MINESWEEPER_GAME_WON)
- game_status = MINESWEEPER_GAME_LOST
- if(CHECK_BITFIELD(obj_flags, EMAGGED) && !exploding_hell)
- exploding_hell = TRUE
- explode_EVERYTHING()
- if(QDELETED(src))
- return
- if(mine_sound)
- switch(rand(1,3)) //Play every time a mine is hit
- if(1)
- playsound(loc, 'sound/arcade/minesweeper_explosion1.ogg', 50, 0, extrarange = -3, falloff = 10)
- if(2)
- playsound(loc, 'sound/arcade/minesweeper_explosion2.ogg', 50, 0, extrarange = -3, falloff = 10)
- if(3)
- playsound(loc, 'sound/arcade/minesweeper_explosion3.ogg', 50, 0, extrarange = -3, falloff = 10)
- mine_sound = FALSE
- else
- playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
- if(table[y1][x1] >= 0) //Check that it's not already flagged
- 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, 0, extrarange = -3, falloff = 10)
- mine_sound = FALSE
- table[y1][x1] -= 10
- if(table[y1][x1] > 10 && !reset_board)
- safe_squares_revealed += 1
- var/y2 = y1
- var/x2 = x1
- work_squares(y2, x2) //Work squares while in this loop so there's less load
- reset_board = FALSE
-
- web += "" //Start setting up the html table
- web += ""
- for(var/y1=1;y1= win_condition && game_status == MINESWEEPER_GAME_PLAYING)
- game_status = MINESWEEPER_GAME_WON
- if(rows < 10 || columns < 10) //If less than easy difficulty
- playsound(loc, 'sound/arcade/minesweeper_winfail.ogg', 10, 0, extrarange = -3, falloff = 10)
- say("You cleared the board of all mines, but you picked too small of a board! Try again with at least a 9x9 board!")
- else
- playsound(loc, 'sound/arcade/minesweeper_win.ogg', 10, 0, extrarange = -3, falloff = 10)
- say("You cleared the board of all mines! Congratulations!")
- if(CHECK_BITFIELD(obj_flags, EMAGGED))
- var/itemname
- switch(rand(1,3))
- if(1)
- itemname = "a syndicate bomb beacon"
- new /obj/item/sbeacondrop/bomb(loc)
- if(2)
- itemname = "a rocket launcher"
- new /obj/item/gun/ballistic/rocketlauncher(loc)
- new /obj/item/ammo_casing/caseless/rocket(loc)
- new /obj/item/ammo_casing/caseless/rocket(loc)
- new /obj/item/ammo_casing/caseless/rocket(loc)
- if(3)
- itemname = "two bags of c4"
- new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)
- new /obj/item/storage/backpack/duffelbag/syndie/x4(loc)
- message_admins("[key_name_admin(user)] won emagged Minesweeper and got [itemname]!")
- visible_message("[src] dispenses [itemname]!", "You hear a chime and a clunk.")
- DISABLE_BITFIELD(obj_flags, EMAGGED)
- else
- var/dope_prizes = (area >= 480) ? list(ARCADE_WEIGHT_RARE) : (area >= 256) ? list(ARCADE_WEIGHT_RARE, ARCADE_WEIGHT_TRICK) : null
- 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
"
-
- 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
"
-
- if(game_status == MINESWEEPER_GAME_PLAYING)
- web += "Return to Main Menu
"
- web += ""
-
- web += ""
- var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/minesweeper)
- saved_web = sheet.css_tag()
- saved_web += web
- updateDialog()
- return
-
-/obj/machinery/computer/arcade/minesweeper/emag_act(mob/user)
- . = ..()
- if(CHECK_BITFIELD(obj_flags, EMAGGED))
- return
- desc = "An arcade machine that generates grids. It's clunking and sparking everywhere, almost as if threatening to explode at any moment!"
- do_sparks(5, 1, src)
- randomnumber = rand(1,255)
- randomcolour = rgb(randomnumber,randomnumber/2,randomnumber/3)
- ENABLE_BITFIELD(obj_flags, EMAGGED)
- if(game_status == MINESWEEPER_GAME_MAIN_MENU)
- to_chat(user, "An ominous tune plays from the arcade's speakers!")
- playsound(user, 'sound/arcade/minesweeper_emag1.ogg', 10, 0, extrarange = 3, falloff = 10)
- else //Can't let you do that, star fox!
- to_chat(user, "The machine buzzes and sparks... the game has been reset!")
- playsound(user, 'sound/machines/buzz-sigh.ogg', 10, 0, extrarange = 3, falloff = 10) //Loud buzz
- game_status = MINESWEEPER_GAME_MAIN_MENU
- return TRUE
-
-/obj/machinery/computer/arcade/minesweeper/proc/custom_generation(mob/user)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 10, 0, extrarange = -3, falloff = 10) //Entered into the menu so ping sound
- var/new_rows = input(user, "How many rows do you want? (Minimum: 4, Maximum: 30)", "Minesweeper Rows") as null|num
- if(!new_rows || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- new_rows = clamp(new_rows + 1, 4, 30)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 10, 0, extrarange = -3, falloff = 10)
- var/new_columns = input(user, "How many columns do you want? (Minimum: 4, Maximum: 50)", "Minesweeper Squares") as null|num
- if(!new_columns || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- new_columns = clamp(new_columns + 1, 4, 50)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 10, 0, extrarange = -3, falloff = 10)
- var/grid_area = (new_rows - 1) * (new_columns - 1)
- var/lower_limit = round(grid_area*0.156)
- var/upper_limit = round(grid_area*0.85)
- var/new_mine_limit = input(user, "How many mines do you want? (Minimum: [lower_limit], Maximum: [upper_limit])", "Minesweeper Mines") as null|num
- if(!new_mine_limit || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 10, 0, extrarange = -3, falloff = 10)
- rows = new_rows
- columns = new_columns
- mine_limit = clamp(new_mine_limit, lower_limit, upper_limit)
- return TRUE
-
-/obj/machinery/computer/arcade/minesweeper/proc/make_mines(reset_everything)
- if(mine_placed < mine_limit)
- for(var/y1=1;y1 0 && x3 > 0)
- y2 = y3
- x2 = x3
- if(table[y2][x2] == 1)
- for(y3=y2-1;y3= rows || y3 < 1)
- continue
- for(x3=x2-1;x3= columns || x3 < 1)
- continue
- if(table[y3][x3] == 0)
- table[y2][x2] += 1
- if(table[y2][x2] == 11)
- for(y3=y2-1;y3= rows || y3 < 1)
- continue
- for(x3=x2-1;x3= columns || x3 < 1)
- continue
- if(table[y3][x3] > 0 && table[y3][x3] < 10)
- table[y3][x3] += 10
- work_squares(y3, x3) //Refresh so we check everything we might be missing
-
-/obj/machinery/computer/arcade/minesweeper/proc/explode_EVERYTHING()
- var/mob/living/user = usr
- to_chat(user, "You feel a great sense of dread wash over you, as if you just unleashed armageddon upon yourself!")
- var/row_limit = rows-1
- var/column_limit = columns-1
- var/mine_limit_v2 = mine_limit
- if(rows > 21)
- row_limit = 20
- if(columns > 21)
- column_limit = 20
- if(mine_limit > (rows*columns) * 0.25)
- mine_limit_v2 = 24
- message_admins("[key_name_admin(user)] failed an emagged Minesweeper arcade and has unleashed an explosion armageddon of size [row_limit],[column_limit] around [ADMIN_LOOKUPFLW(user.loc)]!")
- if(mine_limit_v2 < 10)
- explosion(loc, 2, 5, 10, 15) //Thought you could survive by putting as few mines as possible, huh??
- else
- explosion(loc, 1, 3, rand(1,5), rand(1,10))
- var/list/targets = list()
- var/cur_y = y - round(row_limit * 0.5, 1)
- var/starting_row = 1
- if(cur_y < 1)
- starting_row -= cur_y - 1
- cur_y = 1
- var/start_x = x - round(column_limit * 0.5, 1)
- var/starting_column = 1
- if(start_x < 1)
- starting_column -= start_x - 1
- start_x = 1
- for(var/row in starting_row to length(table)) //translate the mines locations into actual turf coordinates.
- if(!locate(cur_y, start_x, z))
- break
- var/cur_x = start_x
- for(var/column in starting_column to length(table[row]))
- var/coord_value = table[row][column]
- if(coord_value == 10 || coord_value == 0) //there is a mine in here.
- var/turf/T = locate(cur_y, cur_x, z)
- if(!T)
- break
- targets += T
- cur_x++
- cur_y++
- var/num_explosions = 0
- for(var/T in shuffle(targets)) //Create a shitton of explosions in irl turfs if we lose, it will probably kill us
- addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, rand(1,2),rand(1,5),rand(3,10), FALSE), 15 * ++num_explosions)
- if(num_explosions == mine_limit_v2)
- return
-
-#undef MINESWEEPERIMG
-#undef MINESWEEPER_GAME_MAIN_MENU
-#undef MINESWEEPER_GAME_PLAYING
-#undef MINESWEEPER_GAME_LOST
-#undef MINESWEEPER_GAME_WON
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index d3b9725a6b..034f684939 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1383,7 +1383,7 @@
log_combat(user, src, message)
//add_hiddenprint(user)
-/obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+/obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0)
. = ..()
if(obj_integrity < (0.75 * max_integrity))
update_icon()
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 7748d14e41..48ccf325f6 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -231,7 +231,7 @@
return 0
. = ..()
-/obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+/obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0)
. = ..()
if(. && obj_integrity > 0)
if(damage_amount >= 10 && prob(30))
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index ab9c6c1bfd..0e9ee60f79 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -598,8 +598,8 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
/obj/effect/landmark/start/f13/orator
name = "Legion Orator"
-/obj/effect/landmark/start/f13/slavemaster
- name = "Legion Slavemaster"
+/obj/effect/landmark/start/f13/immune
+ name = "Legion Immune"
/obj/effect/landmark/start/f13/priestess
name = "Priestess of Mars"
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
index 3805260759..2c91fb0345 100644
--- a/code/game/objects/effects/spawners/f13lootdrop.dm
+++ b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -225,7 +225,7 @@
name = "tier 1 armor"
loot = list(
/obj/item/clothing/suit/armor/f13/leather_jacket,
- /obj/item/clothing/suit/armor/f13/kit,
+ /obj/item/clothing/suit/armor/f13/leatherarmor,
/obj/effect/spawner/bundle/f13/armor/supafly,
/obj/effect/spawner/bundle/f13/armor/sadist,
/obj/effect/spawner/bundle/f13/armor/blastmaster,
@@ -291,9 +291,10 @@
loot = list(
/obj/effect/spawner/bundle/f13/armor/knight,
/obj/effect/spawner/bundle/f13/armor/metal,
- /obj/item/clothing/suit/armor/f13/leatherarmor,
/obj/item/clothing/suit/armor/f13/leather_jacket/combat,
- /obj/item/clothing/suit/armor/f13/leather_jacket/combat/coat
+ /obj/item/clothing/suit/armor/f13/leather_jacket/combat/coat,
+ /obj/item/clothing/suit/armor/vest,
+ /obj/item/clothing/suit/armor/vest/alt,
)
/obj/effect/spawner/bundle/f13/armor/knight
@@ -318,7 +319,8 @@
/obj/effect/spawner/bundle/f13/armor/combat,
/obj/effect/spawner/bundle/f13/armor/bulletproof,
/obj/effect/spawner/bundle/f13/armor/combat/dark,
- /obj/effect/spawner/bundle/f13/armor/sulphite
+ /obj/effect/spawner/bundle/f13/armor/sulphite,
+ /obj/effect/spawner/bundle/f13/armor/vault,
)
/obj/effect/spawner/bundle/f13/armor/metal/reinforced
@@ -354,6 +356,7 @@
/obj/item/clothing/head/helmet/f13/combat/dark
)
+
/obj/effect/spawner/bundle/f13/armor/sulphite
name = "sulphite raider armor spawner"
items = list(
@@ -383,6 +386,13 @@
/obj/item/clothing/suit/armor/f13/leather_jacket/combat/riotpolice,
/obj/item/clothing/head/helmet/f13/rangerbroken
)
+
+/obj/effect/spawner/bundle/f13/armor/vault
+ name = "vault armor spawner"
+ items = list(
+ /obj/item/clothing/suit/armor/vest/big,
+ /obj/item/clothing/head/helmet/riot/vaultsec,
+ )
/obj/effect/spawner/bundle/f13/armor/combat/mk2
name = "MkII combat armor spawner"
@@ -1550,7 +1560,8 @@
/obj/item/grenade/plastic/c4,
/obj/item/grenade/empgrenade,
/obj/item/grenade/f13/radiation,
- /obj/item/grenade/f13/frag
+ /obj/item/grenade/f13/frag,
+ /obj/effect/spawner/bundle/f13/grenadelauncher,
)
/obj/effect/spawner/lootdrop/f13/bomb/top_tier
lootcount = 1
@@ -1559,7 +1570,8 @@
/obj/item/grenade/f13/incendiary,
/obj/item/grenade/f13/radiation,
/obj/item/grenade/plastic/x4,
- /obj/item/grenade/stingbang/shred = 1
+ /obj/item/grenade/stingbang/shred = 1,
+ /obj/effect/spawner/bundle/f13/rocketlauncher,
)
@@ -1928,12 +1940,27 @@
/obj/item/book/granter/trait/pa_wear = 1,
/obj/item/book/granter/trait/explosives = 10,
/obj/item/book/granter/trait/explosives_advanced = 1,
- /obj/item/book/granter/crafting_recipe/gunsmith_one = 29,
+ /obj/item/book/granter/trait/rifleman = 5,
/obj/item/book/granter/crafting_recipe/gunsmith_two = 20,
/obj/item/book/granter/crafting_recipe/gunsmith_three = 10,
/obj/item/book/granter/crafting_recipe/gunsmith_four = 10
)
+/obj/effect/spawner/lootdrop/f13/traitbooks/low
+ name = "low trait book spawner"
+ lootcount = 1
+ loot = list(/obj/item/book/granter/trait/lowsurgery = 5,
+ /obj/item/book/granter/trait/chemistry = 1,
+ /obj/item/book/granter/trait/techno = 10,
+ /obj/item/book/granter/crafting_recipe/scav_one = 10,
+ /obj/item/book/granter/crafting_recipe/scav_two = 10,
+ /obj/item/book/granter/trait/explosives = 10,
+ /obj/item/book/granter/crafting_recipe/ODF = 10,
+ /obj/item/book/granter/action/drink_fling = 10,
+ /obj/item/book/granter/crafting_recipe/gunsmith_one = 10,
+ )
+
+
/obj/effect/spawner/lootdrop/f13/blueprintLow
name = "gun comps spawner"
icon_state = "blueprint_loot"
@@ -1981,6 +2008,7 @@
/obj/item/book/granter/crafting_recipe/blueprint/thatgun,
/obj/item/book/granter/crafting_recipe/blueprint/uzi,
/obj/item/book/granter/crafting_recipe/blueprint/smg10mm,
+ /obj/item/book/granter/crafting_recipe/blueprint/aep7,
/obj/item/book/granter/crafting_recipe/blueprint/m1carbine,
/obj/item/book/granter/crafting_recipe/blueprint/scoutcarbine,
/obj/item/book/granter/crafting_recipe/blueprint/commando,
@@ -1998,7 +2026,6 @@
/obj/item/book/granter/crafting_recipe/blueprint/r84,
/obj/item/book/granter/crafting_recipe/blueprint/deagle,
/obj/item/book/granter/crafting_recipe/blueprint/marksman,
- /obj/item/book/granter/crafting_recipe/blueprint/aep7,
/obj/item/book/granter/crafting_recipe/blueprint/plasmapistol,
/obj/item/book/granter/crafting_recipe/blueprint/brushgun,
)
diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm
index a0f5cad62c..27d6cf93da 100644
--- a/code/game/objects/items/binoculars.dm
+++ b/code/game/objects/items/binoculars.dm
@@ -42,7 +42,10 @@
src.zoom_out_amt = 19
src.zoom_amt = 10
to_chat(user,"You see the horizon more clearly from this elevation.")
-
+ else if(!is_above_level(T.z))
+ src.zoom_out_amt = 6
+ src.zoom_amt = 10
+
switch(user.dir)
if(NORTH)
_y = zoom_amt
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index ebcf78d32b..76b70a6bad 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -1051,12 +1051,12 @@
item_state = "card-id_leg"
assignment = "prime medallion"
-/obj/item/card/id/dogtag/legslavemaster
- name = "slavemaster medallion"
- desc = "A marked silver disc stamped with the Legion's Bull insignia and a whip. Worn by legionnaires on camp duty."
+/obj/item/card/id/dogtag/legimmune
+ name = "immune medallion"
+ desc = "A marked silver disc stamped with the Legion's Bull insignia. Worn by legionnaires on camp duty."
icon_state = "legionmedallionprime"
item_state = "card-id_leg"
- assignment = "slavemaster medallion"
+ assignment = "immune medallion"
/obj/item/card/id/dogtag/legveteran
name = "veteran medallion"
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index dc9e6a5900..019ab34d99 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -136,10 +136,6 @@
name = "Orion Trail (Computer Board)"
build_path = /obj/machinery/computer/arcade/orion_trail
-/obj/item/circuitboard/computer/arcade/minesweeper
- name = "Minesweeper (Computer Board)"
- build_path = /obj/machinery/computer/arcade/minesweeper
-
/obj/item/circuitboard/computer/arcade/amputation
name = "Mediborg's Amputation Adventure (Computer Board)"
build_path = /obj/machinery/computer/arcade/amputation
diff --git a/code/game/objects/items/melee/f13twohanded.dm b/code/game/objects/items/melee/f13twohanded.dm
index 028e7010b6..10f27e1c44 100644
--- a/code/game/objects/items/melee/f13twohanded.dm
+++ b/code/game/objects/items/melee/f13twohanded.dm
@@ -404,7 +404,7 @@
. = ..()
if(!proximity || !wielded || IS_STAMCRIT(user))
return
- if(istype(A, /obj/structure))
+ if(istype(A, /obj/structure))
var/obj/structure/W = A
W.take_damage(20, BRUTE, "melee", 0)
@@ -500,7 +500,7 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
. = ..()
if(!proximity || !wielded || IS_STAMCRIT(user))
return
- if(istype(A, /obj/structure))
+ if(istype(A, /obj/structure))
var/obj/structure/W = A
W.take_damage(25, BRUTE, "melee", 0)
playsound(loc, hitsound, 80, TRUE)
@@ -535,7 +535,7 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
. = ..()
if(!proximity || !wielded || IS_STAMCRIT(user))
return
- if(istype(A, /obj/structure))
+ if(istype(A, /obj/structure))
var/obj/structure/W = A
W.take_damage(10, BRUTE, "melee", 0)
playsound(loc, hitsound, 50, TRUE)
@@ -558,7 +558,7 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
. = ..()
if(!proximity || !wielded || IS_STAMCRIT(user))
return
- if(istype(A, /obj/structure))
+ if(istype(A, /obj/structure))
var/obj/structure/W = A
W.take_damage(10, BRUTE, "melee", 0)
playsound(loc, hitsound, 80, TRUE)
@@ -602,7 +602,7 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
AddComponent(/datum/component/two_handed, force_unwielded = 25, force_wielded = 45, icon_wielded="[icon_prefix]2")
-// Shaman staff Keywords: Damage 15/30, Big stamina damage buff
+// Shaman staff Keywords: Damage 15/30, Big stamina damage buff
/obj/item/twohanded/sledgehammer/shamanstaff
name = "shaman staff"
desc = "An intricate staff, carried for centuries by the shaman class of the Wayfayer Tribe."
@@ -694,7 +694,7 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
playsound(loc, hitsound, 80, TRUE)
-//Steel Saw Keywords: Damage 14/40, Fast, Wound Bonus, Tool saw-off
+//Steel Saw Keywords: Damage 10/27, 2x attackspeed, Wound Bonus, Tool saw-off, structure bonus damage
/obj/item/twohanded/steelsaw
name = "steel saw"
desc = "A long, heavy circular saw with reinforced blades, designed for cutting through I-beams."
@@ -706,44 +706,45 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
icon_prefix = "steelsaw"
force = 4
toolspeed = 0.5
- wound_bonus = 15
- attack_speed = CLICK_CD_MELEE * 0.9
+ wound_bonus = 20
+ bare_wound_bonus = 20
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
sharpness = SHARP_EDGED
resistance_flags = FIRE_PROOF
w_class = WEIGHT_CLASS_BULKY
slot_flags = null
- total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
+ total_mass = TOTAL_MASS_NORMAL_ITEM //it swings faster
+ var/structure_bonus_damage = 20
var/on_icon_state = "steelsaw_on"
var/off_icon_state = "steelsaw"
var/on_item_state = "steelsaw_on"
var/off_item_state = "steelsaw"
var/weight_class_on = WEIGHT_CLASS_HUGE
var/on = FALSE
- var/force_on = 40
- var/force_off = 14
- var/description_on = "You pull the cord, starting up the chainsaw with a roar and letting the blades spin up."
- var/description_off = "You press the off button, stopping the noise and the carnage."
+ var/force_on = 27 //10 more dps than chainsaw, but less perhit
+ var/force_off = 10
var/on_sound = 'sound/weapons/chainsawhit.ogg'
/obj/item/twohanded/steelsaw/attack_self(mob/user)
on = !on
if(on)
- to_chat(user, description_on)
+ user.visible_message("[user] pulls the cord, starting up the [src] with a roar and letting the blades spin up.")
icon_state = on_icon_state
item_state = on_item_state
w_class = weight_class_on
force = force_on
+ attack_speed = CLICK_CD_MELEE * 0.5
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
playsound(loc, on_sound, 50, TRUE)
else
- to_chat(user, description_off)
+ user.visible_message("[user] presses the off button, stopping the noise and the carnage.")
icon_state = off_icon_state
item_state = off_item_state
w_class = WEIGHT_CLASS_BULKY
force = force_off
attack_verb = list("poked", "scraped")
+ attack_speed = CLICK_CD_MELEE * 1.2
add_fingerprint(user)
/obj/item/twohanded/steelsaw/ComponentInitialize()
@@ -752,6 +753,18 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
update_icon()
+/obj/item/twohanded/steelsaw/afterattack(atom/A, mob/living/user, proximity)
+ . = ..()
+ if(!proximity || !wielded || IS_STAMCRIT(user))
+ return
+ if(istype(A, /obj/structure)) //hurts structures more (it can cut through i-beams, it can ostensibly cut through weaker shit)
+ var/obj/structure/S = A
+ S.take_damage(structure_bonus_damage, BRUTE, "melee", 0, armour_penetration = src.armour_penetration)
+ else if(istype(A, /obj/machinery/door))
+ var/obj/machinery/door/D = A
+ D.take_damage(structure_bonus_damage, BRUTE, "melee", 0, armour_penetration = src.armour_penetration)
+
+
/obj/item/twohanded/steelsaw/suicide_act(mob/living/carbon/user)
if(on)
user.visible_message("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -764,25 +777,43 @@ obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user,
playsound(src, 'sound/weapons/genhit1.ogg', 100, 1)
return(BRUTELOSS)
-//Auto Axe Keywords: Damage 14/40, AP 0.5, Wound Bonus
+//autoaxe Keywords: Damage 10/29, 2x attackspeed, Wound Bonus, structure bonus damage, 0.3 AP
/obj/item/twohanded/steelsaw/autoaxe
name = "auto axe"
- desc = "A reinforced and heavier steel saw, upgraded using the parts of a car engine."
+ desc = "A reinforced and heavier steel saw, upgraded using the parts of a car engine. A little heavy and ungainly to use as a tool, however."
icon_state = "autoaxe"
item_state = "autoaxe"
icon_prefix = "autoaxe"
- force = 6
- force_on = 40
- force_off = 14
+ force_on = 29
+ attack_speed = CLICK_CD_MELEE * 1.5
armour_penetration = 0.3
on_icon_state = "autoaxe_on"
off_icon_state = "autoaxe"
on_item_state = "autoaxe_on"
off_item_state = "autoaxe"
- wound_bonus = 10
- tool_behaviour = null
-
+ toolspeed = 2
+ structure_bonus_damage = 40
+/obj/item/twohanded/steelsaw/autoaxe/attack_self(mob/user)
+ on = !on
+ if(on)
+ user.visible_message("[user] turns the starting crank on the [src], starting it up with a guttral roar.")
+ icon_state = on_icon_state
+ item_state = on_item_state
+ w_class = weight_class_on
+ force = force_on
+ attack_speed = CLICK_CD_MELEE * 0.5
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ playsound(loc, on_sound, 50, TRUE)
+ else
+ user.visible_message("[user] cuts the throttle on the [src], letting the blades slowly spin down.")
+ icon_state = off_icon_state
+ item_state = off_item_state
+ w_class = WEIGHT_CLASS_BULKY
+ force = force_off
+ attack_verb = list("poked", "scraped")
+ attack_speed = CLICK_CD_MELEE * 1.5
+ add_fingerprint(user)
/*
CODE ARCHIVE
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index dfb4e65bc4..5b7fc8aba7 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -209,12 +209,7 @@
max_integrity = 450
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/melee))
- if(cooldown < world.time - 25)
- user.visible_message("[user] bashes [src] with [W]!")
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
- cooldown = world.time
- else if(istype(W, repair_material))
+ if(istype(W, repair_material))
if(obj_integrity >= max_integrity)
to_chat(user, "[src] is already in perfect condition.")
else
@@ -222,6 +217,11 @@
S.use(1)
obj_integrity = max_integrity
to_chat(user, "You repair [src] with [S].")
+ else if(istype(W, /obj/item/melee))
+ if(cooldown < world.time - 25)
+ user.visible_message("[user] bashes [src] with [W]!")
+ playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+ cooldown = world.time
else
return ..()
@@ -250,17 +250,6 @@
take_damage(damage)
return ..()
-/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item))
- if(cooldown < world.time - 25)
- user.visible_message("[user] bashes [src] with [W]!")
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
- cooldown = world.time
- else
- return ..()
-
-
-
//Bulletproof riot shield
obj/item/shield/riot/bullet_proof
name = "bullet resistant shield"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 7735d80905..140bdf2dc2 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -506,7 +506,7 @@
STR.max_items = 7
-/obj/item/storage/belt/military/followers/PopulateContents()
+/obj/item/storage/belt/military/army/military/followers/PopulateContents()
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/melee/classic_baton(src)
@@ -869,8 +869,8 @@
/obj/item/storage/belt/sabre
name = "sabre sheath"
desc = "An ornate sheath designed to hold an officer's blade."
- icon_state = "sheath"
- item_state = "sheath"
+ icon_state = "utilitybelt"
+ item_state = "utility"
w_class = WEIGHT_CLASS_BULKY
content_overlays = TRUE
onmob_overlays = TRUE
@@ -894,6 +894,33 @@
/obj/item/storage/belt/sabre/PopulateContents()
new starting_sword(src)
+/obj/item/storage/belt/sabre/heavy
+ name = "heavy-duty sheath"
+ desc = "A rugged set of leather straps and metal tips to comfortably carry a large variety of blades (and even blunt objects) on your side."
+ icon_state = "sheath"
+ item_state = "sheath"
+ w_class = WEIGHT_CLASS_BULKY
+ content_overlays = TRUE
+ onmob_overlays = TRUE
+ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_NECK
+ fitting_swords = list(/obj/item/melee/smith/shortsword,
+ /obj/item/melee/smith/wakizashi,
+ /obj/item/melee/smith/twohand/broadsword,
+ /obj/item/melee/smith/twohand/zweihander,
+ /obj/item/melee/smith/twohand/katana,
+ /obj/item/melee/smith/sabre,
+ /obj/item/melee/smith/cogheadclub,
+ /obj/item/melee/onehanded/machete,
+ /obj/item/melee/onehanded/club,
+ /obj/item/melee/classic_baton,
+ /obj/item/twohanded/fireaxe,
+ /obj/item/twohanded/baseball,
+ /obj/item/twohanded/sledgehammer,
+ /obj/item/melee/transforming/energy/axe/protonaxe,
+ /obj/item/melee/powered/ripper)
+ starting_sword = null
+
+
/obj/item/storage/belt/sabre/rapier
name = "rapier sheath"
desc = "A sinister, thin sheath, suitable for a rapier."
diff --git a/code/modules/WVM/wvm.dm b/code/modules/WVM/wvm.dm
index 5353752140..45e3e7efff 100644
--- a/code/modules/WVM/wvm.dm
+++ b/code/modules/WVM/wvm.dm
@@ -596,13 +596,19 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("Gas Mask", /obj/item/clothing/mask/gas, 50),
new /datum/data/wasteland_equipment("Advanced Mop", /obj/item/mop/advanced, 100),
new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 200),
- new /datum/data/wasteland_equipment("X-tra Large Beaker", /obj/item/reagent_containers/glass/beaker/plastic, 500),
+ new /datum/data/wasteland_equipment("Metamaterial Beaker", /obj/item/reagent_containers/glass/beaker/meta, 500),
new /datum/data/wasteland_equipment("Medical HUD", /obj/item/clothing/glasses/hud/health, 500),
+ new /datum/data/wasteland_equipment("Prosthetic Left Arm", /obj/item/bodypart/l_arm/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Right Arm", /obj/item/bodypart/r_arm/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Left Leg", /obj/item/bodypart/l_leg/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Right Leg", /obj/item/bodypart/r_leg/robot, 600),
+ new /datum/data/wasteland_equipment("Integrated Toolset Implant", /obj/item/organ/cyberimp/arm/toolset, 700),
new /datum/data/wasteland_equipment("Defibrillator", /obj/item/defibrillator, 1000),
- new /datum/data/wasteland_equipment("Integrated Toolset Implant", /obj/item/organ/cyberimp/arm/toolset, 2000),
- new /datum/data/wasteland_equipment("Upgraded Prosthethic Limbs", /obj/item/storage/box/sparelimbs, 2000),
+ new /datum/data/wasteland_equipment("Chest reviver Implant", /obj/item/organ/cyberimp/chest/reviver, 1500),
+ new /datum/data/wasteland_equipment("Upgraded Prosthetic Limbs", /obj/item/storage/box/sparelimbs, 2000),
new /datum/data/wasteland_equipment("Cat", /mob/living/simple_animal/pet/cat/Runtime, 10000),
)
+
highpop_list = list(
new /datum/data/wasteland_equipment("Medicated Suture", /obj/item/stack/medical/suture/medicated, 45),
new /datum/data/wasteland_equipment("Advanced Regen. Mesh", /obj/item/stack/medical/mesh/advanced, 45),
@@ -610,11 +616,16 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("Gas Mask", /obj/item/clothing/mask/gas, 50),
new /datum/data/wasteland_equipment("Advanced Mop", /obj/item/mop/advanced, 100),
new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 200),
- new /datum/data/wasteland_equipment("X-tra Large Beaker", /obj/item/reagent_containers/glass/beaker/plastic, 500),
+ new /datum/data/wasteland_equipment("Metamaterial Beaker", /obj/item/reagent_containers/glass/beaker/meta, 500),
new /datum/data/wasteland_equipment("Medical HUD", /obj/item/clothing/glasses/hud/health, 500),
+ new /datum/data/wasteland_equipment("Prosthetic Left Arm", /obj/item/bodypart/l_arm/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Right Arm", /obj/item/bodypart/r_arm/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Left Leg", /obj/item/bodypart/l_leg/robot, 600),
+ new /datum/data/wasteland_equipment("Prosthetic Right Leg", /obj/item/bodypart/r_leg/robot, 600),
+ new /datum/data/wasteland_equipment("Integrated Toolset Implant", /obj/item/organ/cyberimp/arm/toolset, 700),
new /datum/data/wasteland_equipment("Defibrillator", /obj/item/defibrillator, 1000),
- new /datum/data/wasteland_equipment("Integrated Toolset Implant", /obj/item/organ/cyberimp/arm/toolset, 2000),
- new /datum/data/wasteland_equipment("Upgraded Prosthethic Limbs", /obj/item/storage/box/sparelimbs, 2000),
+ new /datum/data/wasteland_equipment("Chest reviver Implant", /obj/item/organ/cyberimp/chest/reviver, 1500),
+ new /datum/data/wasteland_equipment("Upgraded Prosthetic Limbs", /obj/item/storage/box/sparelimbs, 2000),
new /datum/data/wasteland_equipment("Cat", /mob/living/simple_animal/pet/cat/Runtime, 10000),
)
diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm
index 1d698ec111..863ab4f337 100644
--- a/code/modules/arousal/arousal.dm
+++ b/code/modules/arousal/arousal.dm
@@ -171,23 +171,6 @@
else if(!silent)
to_chat(src, "You cannot do this without an appropriate container.")
-/mob/living/carbon/human/proc/available_rosie_palms(silent = FALSE, list/whitelist_typepaths = list(/obj/item/dildo))
- if(restrained(TRUE)) //TRUE ignores grabs
- if(!silent)
- to_chat(src, "You can't do that while restrained!")
- return FALSE
- if(!get_num_arms() || !get_empty_held_indexes())
- if(whitelist_typepaths)
- if(!islist(whitelist_typepaths))
- whitelist_typepaths = list(whitelist_typepaths)
- for(var/path in whitelist_typepaths)
- if(is_holding_item_of_type(path))
- return TRUE
- if(!silent)
- to_chat(src, "You need at least one free arm.")
- return FALSE
- return TRUE
-
//Here's the main proc itself
/mob/living/carbon/human/proc/mob_climax(forced_climax=FALSE) //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
if(mb_cd_timer > world.time)
@@ -240,43 +223,8 @@
return
//Ok, now we check what they want to do.
- var/choice = input(src, "Select sexual activity", "Sexual activity:") as null|anything in list("Climax alone","Climax with partner", "Fill container")
+ var/choice = input(src, "Select sexual activity", "Sexual activity:") as null|anything in list("Climax with partner")
if(!choice)
return
- switch(choice)
- if("Climax alone")
- if(!available_rosie_palms())
- return
- var/obj/item/organ/genital/picked_organ = pick_climax_genitals()
- if(picked_organ && available_rosie_palms(TRUE))
- mob_climax_outside(picked_organ)
- if("Climax with partner")
- //We need no hands, we can be restrained and so on, so let's pick an organ
- var/obj/item/organ/genital/picked_organ = pick_climax_genitals()
- if(picked_organ)
- var/mob/living/partner = pick_partner() //Get someone
- if(partner)
- var/spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as null|anything in list("Yes", "No")
- if(spillage && in_range(src, partner))
- mob_climax_partner(picked_organ, partner, spillage == "Yes" ? TRUE : FALSE)
- if("Fill container")
- //We'll need hands and no restraints.
- if(!available_rosie_palms(FALSE, /obj/item/reagent_containers))
- return
- //We got hands, let's pick an organ
- var/obj/item/organ/genital/picked_organ
- picked_organ = pick_climax_genitals() //Gotta be climaxable, not just masturbation, to fill with fluids.
- if(picked_organ)
- //Good, got an organ, time to pick a container
- var/obj/item/reagent_containers/fluid_container = pick_climax_container()
- if(fluid_container && available_rosie_palms(TRUE, /obj/item/reagent_containers))
- mob_fill_container(picked_organ, fluid_container)
-
mb_cd_timer = world.time + mb_cd_length
-
-/*/mob/living/carbon/human/verb/climax_verb() // LoneStar removal.
- set category = "IC"
- set name = "Climax"
- set desc = "Lets you choose a couple ways to ejaculate."
- mob_climax()*/
diff --git a/code/modules/arousal/toys/dildos.dm b/code/modules/arousal/toys/dildos.dm
deleted file mode 100644
index 3f6fa9bb45..0000000000
--- a/code/modules/arousal/toys/dildos.dm
+++ /dev/null
@@ -1,160 +0,0 @@
-//////////
-//DILDOS//
-//////////
-/obj/item/dildo
- name = "dildo"
- desc = "Floppy!"
- icon = 'icons/obj/genitals/dildo.dmi'
- force = 0
- hitsound = 'sound/weapons/tap.ogg'
- throwforce = 0
- icon_state = "dildo_knotted_2"
- alpha = 192//transparent
- var/can_customize = FALSE
- var/dildo_shape = "human"
- var/dildo_size = 2
- var/dildo_type = "dildo"//pretty much just used for the icon state
- var/random_color = TRUE
- var/random_size = FALSE
- var/random_shape = FALSE
- var/is_knotted = FALSE
- //Lists moved to _cit_helpers.dm as globals so they're not instanced individually
-
-/obj/item/dildo/proc/update_appearance()
- icon_state = "[dildo_type]_[dildo_shape]_[dildo_size]"
- var/sizeword = ""
- switch(dildo_size)
- if(1)
- sizeword = "small "
- if(3)
- sizeword = "big "
- if(4)
- sizeword = "huge "
- if(5)
- sizeword = "gigantic "
-
- name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]"
-
-/obj/item/dildo/AltClick(mob/living/user)
- . = ..()
- if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- customize(user)
- return TRUE
-
-/obj/item/dildo/proc/customize(mob/living/user)
- if(!can_customize)
- return FALSE
- if(src && !user.incapacitated() && in_range(user,src))
- var/color_choice = input(user,"Choose a color for your dildo.","Dildo Color") as null|anything in GLOB.dildo_colors
- if(src && color_choice && !user.incapacitated() && in_range(user,src))
- sanitize_inlist(color_choice, GLOB.dildo_colors, "Red")
- color = GLOB.dildo_colors[color_choice]
- update_appearance()
- if(src && !user.incapacitated() && in_range(user,src))
- var/shape_choice = input(user,"Choose a shape for your dildo.","Dildo Shape") as null|anything in GLOB.dildo_shapes
- if(src && shape_choice && !user.incapacitated() && in_range(user,src))
- sanitize_inlist(shape_choice, GLOB.dildo_colors, "Knotted")
- dildo_shape = GLOB.dildo_shapes[shape_choice]
- update_appearance()
- if(src && !user.incapacitated() && in_range(user,src))
- var/size_choice = input(user,"Choose the size for your dildo.","Dildo Size") as null|anything in GLOB.dildo_sizes
- if(src && size_choice && !user.incapacitated() && in_range(user,src))
- sanitize_inlist(size_choice, GLOB.dildo_colors, "Medium")
- dildo_size = GLOB.dildo_sizes[size_choice]
- update_appearance()
- if(src && !user.incapacitated() && in_range(user,src))
- var/transparency_choice = input(user,"Choose the transparency of your dildo. Lower is more transparent!(192-255)","Dildo Transparency") as null|num
- if(src && transparency_choice && !user.incapacitated() && in_range(user,src))
- sanitize_integer(transparency_choice, 192, 255, 192)
- alpha = transparency_choice
- update_appearance()
- return TRUE
-
-/obj/item/dildo/Initialize()
- . = ..()
- if(random_color == TRUE)
- var/randcolor = pick(GLOB.dildo_colors)
- color = GLOB.dildo_colors[randcolor]
- if(random_shape == TRUE)
- var/randshape = pick(GLOB.dildo_shapes)
- dildo_shape = GLOB.dildo_shapes[randshape]
- if(random_size == TRUE)
- var/randsize = pick(GLOB.dildo_sizes)
- dildo_size = GLOB.dildo_sizes[randsize]
- update_appearance()
- alpha = rand(192, 255)
- pixel_y = rand(-7,7)
- pixel_x = rand(-7,7)
-
-/obj/item/dildo/examine(mob/user)
- . = ..()
- if(can_customize)
- . += "Alt-Click \the [src.name] to customize it."
-
-/obj/item/dildo/random//totally random
- name = "random dildo"//this name will show up in vendors and shit so you know what you're vending(or don't, i guess :^))
- random_color = TRUE
- random_shape = TRUE
- random_size = TRUE
-
-/obj/item/dildo/knotted
- dildo_shape = "knotted"
- name = "knotted dildo"
- attack_verb = list("penetrated", "knotted", "slapped", "inseminated")
-
-obj/item/dildo/human
- dildo_shape = "human"
- name = "human dildo"
- attack_verb = list("penetrated", "slapped", "inseminated")
-
-obj/item/dildo/plain
- dildo_shape = "plain"
- name = "plain dildo"
- attack_verb = list("penetrated", "slapped", "inseminated")
-
-obj/item/dildo/flared
- dildo_shape = "flared"
- name = "flared dildo"
- attack_verb = list("penetrated", "slapped", "neighed", "gaped", "prolapsed", "inseminated")
-
-obj/item/dildo/flared/huge
- name = "literal horse cock"
- desc = "THIS THING IS HUGE!"
- dildo_size = 4
- force = 10
-
-obj/item/dildo/custom
- name = "customizable dildo"
- desc = "Thanks to significant advances in synthetic nanomaterials, this dildo is capable of taking on many different forms to fit the user's preferences! Pricy!"
- can_customize = TRUE
- random_color = TRUE
- random_shape = TRUE
- random_size = TRUE
-
-// Suicide acts, by request
-
-/obj/item/dildo/proc/manual_suicide(mob/living/user)
- user.visible_message("[user] finally finishes deepthroating the [src], and their life.")
- user.adjustOxyLoss(200)
- user.death(0)
-
-/obj/item/dildo/suicide_act(mob/living/user)
-// is_knotted = ((src.dildo_shape == "knotted")?"They swallowed the knot":"Their face is turning blue")
- if(do_after(user,17,target=src))
- user.visible_message("[user] tears-up and gags as they shove [src] down their throat! It looks like [user.p_theyre()] trying to commit suicide!")
- playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1)
- user.Stun(150)
- user.adjust_blurriness(8)
- var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES)
- eyes?.applyOrganDamage(10)
- return MANUAL_SUICIDE
-
-/obj/item/dildo/flared/huge/suicide_act(mob/living/user)
- if(do_after(user,35,target=src))
- user.visible_message("[user] tears-up and gags as they try to deepthroat the [src]! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!")
- playsound(loc, 'sound/weapons/gagging.ogg', 50, 2, -1)
- user.Stun(300)
- user.adjust_blurriness(8)
- return MANUAL_SUICIDE
-
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 29e6d56ab8..d2bea5d1d2 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -245,24 +245,6 @@
)
*/
-/datum/asset/spritesheet/simple/minesweeper
- name = "minesweeper"
- assets = list(
- "1" = 'icons/ui_icons/minesweeper_tiles/one.png',
- "2" = 'icons/ui_icons/minesweeper_tiles/two.png',
- "3" = 'icons/ui_icons/minesweeper_tiles/three.png',
- "4" = 'icons/ui_icons/minesweeper_tiles/four.png',
- "5" = 'icons/ui_icons/minesweeper_tiles/five.png',
- "6" = 'icons/ui_icons/minesweeper_tiles/six.png',
- "7" = 'icons/ui_icons/minesweeper_tiles/seven.png',
- "8" = 'icons/ui_icons/minesweeper_tiles/eight.png',
- "empty" = 'icons/ui_icons/minesweeper_tiles/empty.png',
- "flag" = 'icons/ui_icons/minesweeper_tiles/flag.png',
- "hidden" = 'icons/ui_icons/minesweeper_tiles/hidden.png',
- "mine" = 'icons/ui_icons/minesweeper_tiles/mine.png',
- "minehit" = 'icons/ui_icons/minesweeper_tiles/minehit.png'
- )
-
/datum/asset/spritesheet/simple/pills
name = "pills"
assets = list(
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index c1319f5f83..0074f6839f 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -145,8 +145,6 @@
/obj/item/circuitboard/computer/arcade/battle,
/obj/item/circuitboard/computer/arcade/orion_trail,
/obj/item/circuitboard/computer/arcade/orion_trail,
- /obj/item/circuitboard/computer/arcade/minesweeper,
- /obj/item/circuitboard/computer/arcade/minesweeper,
/obj/item/circuitboard/computer/slot_machine,
/obj/item/circuitboard/computer/slot_machine,
/obj/item/circuitboard/computer/slot_machine,
@@ -395,26 +393,6 @@
/obj/item/stack/tile/noslip/thirty)
crate_name = "high-traction floor tiles crate"
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////// Lewd Supplies ///////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-/datum/supply_pack/misc/lewd
- name = "Lewd Crate" // OwO
- desc = "Pssst, want to have a good time with your sluts? Well I got what you want! Maid clothing, dildos, collars and more!"
- cost = 5250
- contraband = TRUE
- contains = list(/obj/item/dildo/custom,
- /obj/item/dildo/custom,
- /obj/item/clothing/under/costume/maid,
- /obj/item/clothing/under/costume/maid,
- /obj/item/electropack/shockcollar,
- /obj/item/electropack/shockcollar,
- /obj/item/restraints/handcuffs/fake/kinky,
- /obj/item/restraints/handcuffs/fake/kinky)
- crate_name = "lewd kit"
- crate_type = /obj/structure/closet/crate
-
///Special supply crate that generates random syndicate gear up to a determined TC value
/datum/supply_pack/misc/syndicate
diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm
index 0512ee3f1c..60ceb8200e 100644
--- a/code/modules/clothing/head/f13factionhead.dm
+++ b/code/modules/clothing/head/f13factionhead.dm
@@ -302,6 +302,11 @@
icon_state = "legion-vex-alt"
item_state = "legion-vex-alt"
+/obj/item/clothing/head/helmet/f13/legion/vet/nightvexil
+ name = "legion nightstalker vexillarius helmet"
+ desc = "This helmet is decorated with the pelt of a nightstalker."
+ icon_state = "legion-vex-night"
+ item_state = "legion-vex-night"
/obj/item/clothing/head/helmet/f13/legion/venator
name = "legion venator hood"
@@ -1012,6 +1017,9 @@
/obj/item/clothing/head/helmet/riot/vaultsec
name = "security helmet"
desc = "A standard issue vault security helmet, pretty robust."
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 25, energy = "25", "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 50)
+ slowdown = 0.01
+
/obj/item/clothing/head/helmet/riot/vaultsec/vc
name = "vtcc riot helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 4cdb117728..c8e131cb01 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -42,7 +42,7 @@
. += "[attached_light] looks like it can be unscrewed from [src]."
else if(can_flashlight)
. += "It has a mounting point for a seclite."
- . += "This helmet provides [armor.bullet] bullet, [armor.laser] energy, and [armor.melee] melee resistance."
+ . += "This helmet provides [armor.bullet]% bullet, [armor.laser]% laser, and [armor.melee]% melee resistance."
/obj/item/clothing/head/helmet/handle_atom_del(atom/A)
if(A == attached_light)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d4bc799537..f1b19b1b9b 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -17,11 +17,10 @@
/obj/item/clothing/head/that
name = "top-hat"
- desc = "(I) It's an amish looking hat."
+ desc = "It's an amish looking hat."
icon_state = "tophat"
item_state = "that"
throwforce = 1
- armor = list("tier" = 1)
dog_fashion = /datum/dog_fashion/head
beepsky_fashion = /datum/beepsky_fashion/tophat
@@ -36,8 +35,7 @@
/obj/item/clothing/head/redcoat
name = "redcoat's hat"
icon_state = "redcoat"
- desc = "(I) 'I guess it's a redhead.'"
- armor = list("tier" = 1)
+ desc = "'I guess it's a redhead.'"
/obj/item/clothing/head/mailman
name = "mailman's hat"
@@ -46,10 +44,10 @@
/obj/item/clothing/head/plaguedoctorhat
name = "plague doctor's hat"
- desc = "(I) These were once used by plague doctors. They're pretty much useless."
+ desc = "These were once used by plague doctors. They're pretty much useless."
icon_state = "plaguedoctor"
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 15, "bio" = 25, "rad" = 0, "fire" = 30, "acid" = 0)
permeability_coefficient = 0.01
- armor = list("tier" = 1)
/obj/item/clothing/head/hasturhood
@@ -299,12 +297,10 @@
/obj/item/clothing/head/crown
name = "crown"
- desc = "(I) A crown fit for a king, a petty king maybe."
+ desc = "A crown fit for a king, a petty king maybe."
icon_state = "crown"
- armor = list("tier" = 1,"energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
dynamic_hair_suffix = ""
-
beepsky_fashion = /datum/beepsky_fashion/king
/obj/item/clothing/head/crown/fancy
@@ -455,15 +451,16 @@
/obj/item/clothing/head/hunter
name = "bounty hunting hat"
- desc = "(I) Ain't nobody gonna cheat the hangman in my town."
+ desc = "Ain't nobody gonna cheat the hangman in my town."
icon_state = "hunter"
item_state = "hunter"
- armor = list("tier" = 1, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 0)
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/head/kepi
name = "kepi"
desc = "A white cap with visor. Oui oui, mon capitane!"
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 10, "bomb" = 15, "bio" = 5, "rad" = 5, "fire" = 30, "acid" = 5)
icon_state = "kepi"
/obj/item/clothing/head/kepi/old
@@ -489,26 +486,27 @@
icon_state = "kabuto"
item_state = "kabuto"
flags_inv = HIDEHAIR|HIDEEARS
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 0)
/obj/item/clothing/head/fluff/bandit
name = "bandit hat"
- desc = "(I) A black cowboy hat with a large brim, curved to the sides, and a silver eagle pinned to the front."
+ desc = "A black cowboy hat with a large brim, curved to the sides, and a silver eagle pinned to the front."
icon_state = "bandit"
item_state = "fedora"
- armor = list("tier" = 1)
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 0)
/obj/item/clothing/head/fluff/gambler
name = "gambler hat"
- desc = "(I) Perfect for a ramblin' gamblin' man." //But I got to ramble (ramblin' man) //Oh I got to gamble (gamblin' man) //Got to got to ramble (ramblin' man) //I was born a ramblin' gamblin' man
+ desc = "Perfect for a ramblin' gamblin' man." //But I got to ramble (ramblin' man) //Oh I got to gamble (gamblin' man) //Got to got to ramble (ramblin' man) //I was born a ramblin' gamblin' man
icon_state = "gambler"
item_state = "dethat"
- armor = list("tier" = 1)
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 0)
/obj/item/clothing/head/fluff/Bikerhelmet
name = "Future Helmet"
- desc = "(II) A helmet of some sort as if from the distant future."
+ desc = "(A helmet of some sort as if from the distant future."
icon_state = "biker_helmet"
item_state = "biker_helmet"
- armor = list("tier" = 2,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 0)
resistance_flags = FIRE_PROOF
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 080cb4ed12..e18cdd65d9 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,7 +8,7 @@
equip_delay_other = 40
max_integrity = 250
resistance_flags = NONE
- armor = list("melee" = 40, "bullet" = 40, "laser" = 40, energy = "25", "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 25)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0 , "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 25)
slowdown = 0.01
var/list/protected_zones = list(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
@@ -31,13 +31,24 @@
/obj/item/clothing/suit/armor/vest
name = "armor vest"
- desc = "A slim armored vest with a rigid exterior that provides decent protection against most types of damage."
+ desc = "A slim armored vest with a rigid exterior that provides decent protection against pistol rounds, stabs, and bludgeons."
icon_state = "armoralt"
item_state = "armoralt"
blood_overlay_type = "armor"
dog_fashion = /datum/dog_fashion/back
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
- armor = list("melee" = 40, "bullet" = 40, "laser" = 40, energy = "25", "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 25)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, energy = "25", "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 30)
+ slowdown = 0.05
+
+/obj/item/clothing/suit/armor/vest/big
+ name = "security vest"
+ desc = "A thick bullet-resistant vest composed of ballistic plates and padding. Common with pre-war security forces."
+ icon = 'icons/fallout/clothing/armored_medium.dmi'
+ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
+ icon_state = "vest_armor"
+ item_state = "vest_armor"
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 25, energy = "20", "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 30)
+ slowdown = 0.18
/obj/item/clothing/suit/armor/vest/trench
name = "followers trenchcoat"
@@ -46,9 +57,11 @@
item_state = "followerstrench"
/obj/item/clothing/suit/armor/vest/alt
- desc = "A Type I armored vest that provides decent protection against most types of damage."
+ desc = "A thick armored vest that provides decent protection against most types of damage."
icon_state = "armor"
item_state = "armor"
+ armor = list("melee" = 40, "bullet" = 40, "laser" = 40, energy = "25", "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 30)
+ slowdown = 0.1
/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
diff --git a/code/modules/clothing/suits/f13armor.dm b/code/modules/clothing/suits/f13armor.dm
index cb60a1244c..75eba33fc6 100644
--- a/code/modules/clothing/suits/f13armor.dm
+++ b/code/modules/clothing/suits/f13armor.dm
@@ -57,7 +57,7 @@
item_state = "armorkit"
armor = list("melee" = 20, "bullet" = 40, "laser" = 15, "energy" = 15, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0, "wound" = 30)
strip_delay = 30
- slowdown = 0.05
+ slowdown = 0.025
/obj/item/clothing/suit/armor/f13/kit/Initialize()
. = ..()
@@ -72,7 +72,7 @@
strip_delay = 30
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
- slowdown = 0.05
+ slowdown = 0.025
/obj/item/clothing/suit/armor/f13/punk/Initialize()
. = ..()
@@ -138,7 +138,7 @@
icon_state = "steel_bib"
item_state = "steel_bib"
armor = list("melee" = 20, "bullet" = 45, "laser" = 20, "energy" = 15, "bomb" = 20, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 40)
- slowdown = 0.05
+ slowdown = 0.06
strip_delay = 5
//Combat armor (Faction specific is on f13factionarmor.dm)
@@ -170,7 +170,7 @@
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "combat_armor_mk2"
item_state = "combat_armor_mk2"
- armor = list("melee" = 50, "bullet" = 50, "laser" = 40, "energy" = 22, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55)
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 43, "energy" = 22, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55)
slowdown = 0.15
/obj/item/clothing/suit/armor/f13/combat/mk2/dark
@@ -797,16 +797,12 @@
icon_state = "bulletproof"
item_state = "armor"
blood_overlay_type = "armor"
- armor = list("melee" = 25, "bullet" = 60, "laser" = 25, "energy" = 35, "bomb" = 50, "bio" = 40, "rad" = 10, "fire" = 60, "acid" = 10, "wound" = 50)
+ armor = list("melee" = 27, "bullet" = 60, "laser" = 27, "energy" = 35, "bomb" = 50, "bio" = 40, "rad" = 10, "fire" = 60, "acid" = 10, "wound" = 50)
strip_delay = 70
equip_delay_other = 50
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
slowdown = 0.05
-/obj/item/clothing/suit/armor/bulletproof/Initialize()
- . = ..()
- AddComponent(/datum/component/armor_plate)
-
/obj/item/clothing/suit/armor/bone
name = "bone armor"
desc = "A tribal armor plate, crafted from animal bone."
diff --git a/code/modules/clothing/suits/f13factionarmor.dm b/code/modules/clothing/suits/f13factionarmor.dm
index a7ba943058..60489da40c 100644
--- a/code/modules/clothing/suits/f13factionarmor.dm
+++ b/code/modules/clothing/suits/f13factionarmor.dm
@@ -336,6 +336,7 @@
icon_state = "legion_slaveleather"
item_state = "legion_slaveleather"
allowed = list(/obj/item/hatchet, /obj/item/scythe, /obj/item/cultivator, /obj/item/shovel)
+ armor = list("melee" = 20, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 0)
/*
/obj/item/clothing/suit/armor/f13/legion/vet/orator
@@ -358,8 +359,16 @@
item_state = "vest_utility"
icon = 'icons/fallout/clothing/suits_utility.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/suit_utility.dmi'
- armor = list("melee" = 20, "bullet" = 20, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 10, "rad" = 20, "fire" = 30, "acid" = 0)
- pocket_storage_component_path = /datum/component/storage/concrete/pockets
+ armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 15, "bio" = 10, "rad" = 20, "fire" = 30, "acid" = 0)
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/utility
+ slowdown = 0.02
+
+/datum/component/storage/concrete/pockets/utility
+ max_items = 4
+
+/obj/item/clothing/suit/armor/f13/utilityvest/Initialize()
+ . = ..()
+ AddComponent(/datum/component/armor_plate)
/obj/item/clothing/suit/armor/f13/ncrarmor
name = "NCR patrol vest"
@@ -698,11 +707,22 @@
icon_state = "towntrench_medium"
armor = list("melee" = 40, "bullet" = 40, "laser" = 35, "energy" = 35, "bomb" = 30, "bio" = 40, "rad" = 40, "fire" = 50, "acid" = 10, "wound" = 50)
slowdown = 0.06 //combat armor but less slowdown
-
+
/obj/item/clothing/suit/armor/f13/town/deputy/Initialize()
. = ..()
AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/suit/armor/vest/oasis
+ name = "OPD vest"
+ desc = "A slim armored vest with a rigid exterior that provides decent protection against most types of damage. This one has pockets sewn into the front and OPD stitched on the back."
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets
+ armor = list("melee" = 38, "bullet" = 38, "laser" = 38, "energy" = 30, "bomb" = 40, "bio" = 40, "rad" = 40, "fire" = 50, "acid" = 10, "wound" = 50)
+ slowdown = 0.06
+/obj/item/clothing/suit/armor/vest/oasis/Initialize()
+ . = ..()
+ AddComponent(/datum/component/armor_plate)
+
/obj/item/clothing/suit/armor/f13/metalarmor/steelbib/oasis
name = "heavy steel breastplate"
desc = "a steel breastplate, inspired by a pre-war design. Looks like oasis citiznes added an additional layer of metal on the front face."
diff --git a/code/modules/fallout/obj/food_and_drinks/wastefood.dm b/code/modules/fallout/obj/food_and_drinks/wastefood.dm
index 5fc91f84d9..9ad54e25a1 100644
--- a/code/modules/fallout/obj/food_and_drinks/wastefood.dm
+++ b/code/modules/fallout/obj/food_and_drinks/wastefood.dm
@@ -7,489 +7,6 @@
bonus_reagents = list( /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("Monkey" = 1)
foodtype = MEAT | VEGETABLES
-
-/////PLANTS Fallout 13///////
-
-/obj/item/seeds/buffalogourd
- name = "pack of buffalo gourd seeds"
- desc = "These seeds grow into buffalo vines.
they appear to be edible once cooked!"
- icon_state = "seed-gourd"
- species = "buffalo gourd"
- plantname = "Buffalo Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/buffalogourd
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "gourd-grow"
- icon_dead = "gourd-dead"
- icon_harvest = "gourd-harvest"
- reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/toxin = 0.1)
- lifespan = 50
- endurance = 40
- maturation = 10
- production = 1
- yield = 3
- growthstages = 3
-
-/obj/item/seeds/buffalogourd/microwave_act(obj/machinery/microwave/MW) //The act allows it to be cooked over a bonfire grille too.
- ..()
- new /obj/item/reagent_containers/food/snacks/roastseeds/buffalogourd(drop_location())
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/roastseeds/buffalogourd //Inherits from pumpkin.dm's roast seeds, similarity commented out for clarity
- name = "roasted gourd seeds"
- desc = "Well prepared crispy buffalo gourd seeds, full of chewy protein."
- //icon_state = "roasted_seeds"
- list_reagents = list(/datum/reagent/consumable/cooking_oil = 1, /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1.5)
- //bitesize = 2
- //w_class = WEIGHT_CLASS_TINY
- //tastes = list("crunchy" = 1)
- //foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/grown/buffalogourd
- seed = /obj/item/seeds/buffalogourd
- name = "buffalo gourd"
- desc = "A bitter tasting vine plant, with a watery fleshy texture."
- icon_state = "buffalo_gourd"
- filling_color = "#008000"
- bitesize_mod = 3
- foodtype = FRUIT | GROSS
- juice_results = list(/datum/reagent/lye= 0.5) // The oil made from the gourd plant itself is used in Native American soap.
- distill_reagent = list(/datum/chemical_reaction/pestkiller= 0.25) //Native Americans used the extract of gourd as small vermin pesticide.
-
-/obj/item/seeds/coyotetobacco
- name = "pack of coyote tobacco seeds"
- desc = "These seeds grow into coyote tobacco plants."
- icon_state = "seed-coyote"
- species = "coyote tobacco"
- plantname = "Coyote Tobacco Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/coyotetobacco
- genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
- lifespan = 20
- maturation = 5
- production = 5
- yield = 10
- growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "coyote-grow"
- icon_dead = "coyote-dead"
- icon_harvest = "coyote-harvest"
- reagents_add = list(/datum/reagent/drug/nicotine = 0.1, /datum/reagent/consumable/nutriment = 0.1)
-
-/obj/item/reagent_containers/food/snacks/grown/coyotetobacco
- seed = /obj/item/seeds/coyotetobacco
- name = "coyote tobacco leaves"
- desc = "This tobacco like plant is commonly used by tribals for a great variety of medicinal and ceremonial purposes."
- icon_state = "Coyote Tobacco"
- filling_color = "#008000"
- juice_results = list(/datum/reagent/consumable/tea/coyotetea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/deathroach
-
-
-/obj/item/seeds/feracactus
- name = "pack of barrel cactus seeds"
- desc = "These seeds grow into a barrel cactus."
- icon_state = "seed-feracactus"
- growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
- icon_grow = "feracactus-grow"
- icon_dead = "feracactus-dead"
- icon_harvest = "feracactus-harvest"
- species = "barrel cactus"
- plantname = "Barrel Cactus"
- product = /obj/item/reagent_containers/food/snacks/grown/feracactus
- lifespan = 60
- endurance = 20
- yield = 2
- growthstages = 2
- production = 5
- maturation = 5
- reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/calomel = 0.1,)
-
-/obj/item/reagent_containers/food/snacks/grown/feracactus
- seed = /obj/item/seeds/feracactus
- name = "barrel cactus fruit"
- desc = "Carefully harvested spineless barrel-cactus fruit, it feels dry to the touch but appears more than edible."
- icon_state = "feracactus"
- filling_color = "#FF6347"
- foodtype = FRUIT
- juice_results = list(/datum/reagent/consumable/tea/feratea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/yellowpulque
-
-/obj/item/seeds/poppy/broc
- name = "pack of broc seeds"
- desc = "These seeds grow into broc flowers."
- icon_state = "seed-broc"
- species = "broc"
- plantname = "Broc Flowers"
- product = /obj/item/reagent_containers/food/snacks/grown/broc
- lifespan = 25
- endurance = 10
- yield = 4
- growthstages = 3
- production = 4
- maturation = 4
- growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
- icon_harvest = "broc-harvest"
- icon_grow = "broc-grow"
- icon_dead = "broc-dead"
- //mutatelist = list(/obj/item/seeds/geraniumseed, /obj/item/seeds/lilyseed)
- reagents_add = list(/datum/reagent/medicine/dexalin = 0.2, /datum/reagent/medicine/salglu_solution = 0.05, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/bicaridine = 0.1,)
-
-/obj/item/reagent_containers/food/snacks/grown/broc
- seed = /obj/item/seeds/poppy/broc
- name = "broc flower"
- desc = "This vibrant, orange flower grows on tall stalks in the wasteland and exhibits moderate healing properties, even when unprocessed."
- icon_state = "broc"
- //slot_flags = SLOT_HEAD
- filling_color = "#FF6347"
- juice_results = list(/datum/reagent/consumable/tea/broctea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/brocbrew
-
-
-/obj/item/seeds/xander
- name = "pack of xander seeds"
- desc = "These seeds grow into xander roots."
- icon_state = "seed-xander"
- species = "xander"
- plantname = "Xander Roots"
- product = /obj/item/reagent_containers/food/snacks/grown/xander
- lifespan = 25
- endurance = 10
- yield = 3
- growthstages = 4
- production = 4
- maturation = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "xander-grow"
- icon_harvest = "xander-harvest"
- icon_dead = "xander-dead"
- reagents_add = list(/datum/reagent/medicine/antitoxin = 0.2, /datum/reagent/medicine/salglu_solution = 0.05, /datum/reagent/consumable/nutriment = 0.1)
-
-/obj/item/reagent_containers/food/snacks/grown/xander
- seed = /obj/item/seeds/xander
- name = "xander root"
- desc = "Xander roots are large, hardy, turnip-like roots with mild healing properties."
- icon_state = "xander"
- filling_color = "#FF6347"
- juice_results = list(/datum/reagent/consumable/tea/xandertea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/salgam
-
-/*HRP*/
-
-/obj/item/seeds/horsenettle
- name = "pack of horsenettle seeds"
- desc = "These seeds grow into white horsenettles."
- icon_state = "seed-horsenettle"
- species = "horsenettle"
- plantname = "White Horsenettles"
- product = /obj/item/reagent_containers/food/snacks/grown/horsenettle
- lifespan = 30
- endurance = 40
- yield = 4
- growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "horsenettle-grow"
- icon_dead = "horsenettle-dead"
- icon_harvest = "horsenettle-harvest"
- genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
- reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
-
-/obj/item/reagent_containers/food/snacks/grown/horsenettle
- seed = /obj/item/seeds/horsenettle
- name = "horsenettle berries"
- desc = "The tribes use these berries as a vegetable rennet."
- icon_state = "White Horsenettle"
- filling_color = "#FF00FF"
- bitesize_mod = 2
- foodtype = FRUIT
- juice_results = list(/datum/reagent/consumable/enzyme = 1)
- tastes = list("searing pain" = 1)
- distill_reagent = /datum/reagent/consumable/enzyme
-
-
-/obj/item/seeds/mesquite
- name = "pack of honey mesquite seeds"
- desc = "These seeds grows into a mesquite plant."
- icon_state = "mycelium-tower"
- species = "honey mesquite"
- plantname = "Honey Mesquite"
- product = /obj/item/reagent_containers/food/snacks/grown/mesquite
- lifespan = 80
- endurance = 50
- maturation = 6
- production = 5
- yield = 5
- potency = 50
- growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "mesquite-grow"
- icon_dead = "mesquite-dead"
- icon_harvest = "mesquite-harvest"
- genes = list(/datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/consumable/honey = 0.1, /datum/reagent/consumable/nutriment = 0.05)
-
-/obj/item/reagent_containers/food/snacks/grown/mesquite
- seed = /obj/item/seeds/mesquite
- name = "honey mesquite pods"
- desc = "The honey mesquite pod grows on a short tree with willow-like branches. Trees with pickable pods will appear bushier in foliage and have strings of pods on them, resembling a fern pattern. Pods can be eaten or used in recipes"
- gender = PLURAL
- icon_state = "Mesquite Pod"
- filling_color = "#F0E68C"
- bitesize_mod = 2
- foodtype = VEGETABLES
- juice_results = list(/datum/reagent/consumable/honey = 0.1)
- tastes = list("crunchy sweetness" = 1)
- distill_reagent = /datum/reagent/consumable/ethanol/wastemead
-
-
-/obj/item/seeds/pinyon
- name = "pack of pinyon pine seeds"
- desc = "The seeds of the pinyon pine, known as pine nuts or pi��ns, are an important food for settlers and tribes living in the mountains of the North American Southwest. All species of pine produce edible seeds, but in North America only the pinyon produces seeds large enough to be a major source of food."
- icon_state = "seed-pinyon"
- species = "pinyon pine"
- plantname = "Pinyon Pine"
- product = /obj/item/reagent_containers/food/snacks/grown/pinyon
- lifespan = 80
- endurance = 50
- maturation = 9
- production = 6
- yield = 5
- potency = 50
- growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "pinyon-grow"
- icon_dead = "pinyon-dead"
- icon_harvest = "pinyon-harvest"
- genes = list(/datum/plant_gene/trait/repeated_harvest)
- reagents_add = list( /datum/reagent/consumable/nutriment = 0.05)
-
-/obj/item/reagent_containers/food/snacks/grown/pinyon
- seed = /obj/item/seeds/pinyon
- name = "pinyon nuts"
- desc = "The seeds of the pinyon pine, known as pine nuts or pi��ns, are an important food for settlers and tribes living in the mountains of the North American Southwest. All species of pine produce edible seeds, but in North America only the pinyon produces seeds large enough to be a major source of food."
- gender = PLURAL
- icon_state = "Pinyon Nuts"
- filling_color = "#F0E68C"
- bitesize_mod = 2
- foodtype = GRAIN
- grind_results = list(/datum/reagent/consumable/flour = 0)
- tastes = list("pine nuts" = 1)
-
-/obj/item/seeds/pricklypear
- name = "pack of prickly pear seeds"
- desc = "These seeds grow into a prickly pear cactus."
- icon_state = "seed-prickly"
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "prickly-grow"
- icon_dead = "prickly-dead"
- icon_harvest = "prickly-harvest"
- species = "prickly pear"
- plantname = "Prickly pear cactus"
- genes = list(/datum/plant_gene/trait/repeated_harvest)
- product = /obj/item/reagent_containers/food/snacks/grown/pricklypear
- reagents_add = list(/datum/reagent/consumable/nutriment = 0.2, /datum/reagent/water = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.05)
- lifespan = 60
- endurance = 20
- yield = 2
- growthstages = 4
- production = 4
- maturation = 5
-
-/obj/item/reagent_containers/food/snacks/grown/pricklypear
- seed = /obj/item/seeds/pricklypear
- name = "prickly pear fruit"
- desc = "Distinguished by having cylindrical, rather than flattened, stem segments with large barbed spines. The stem joints are very brittle on young stems, readily breaking off when the barbed spines stick to clothing or animal fur."
- icon_state = "Prickly Pear"
- filling_color = "#FF6347"
- foodtype = FRUIT
- bitesize_mod = 2
- juice_results = list(/datum/reagent/consumable/tea/pricklytea = 0)
- tastes = list("sweet cactus" = 1)
- distill_reagent = /datum/reagent/consumable/ethanol/pinkpulque
-
-/obj/item/grown/pricklypear/pickup(mob/living/user)
- ..()
- if(!iscarbon(user))
- return FALSE
- var/mob/living/carbon/C = user
- if(C.gloves)
- return FALSE
- var/hit_zone = (C.held_index_to_dir(C.active_hand_index) == "l" ? "l_":"r_") + "arm"
- var/obj/item/bodypart/affecting = C.get_bodypart(hit_zone)
- if(affecting)
- if(affecting.receive_damage(0, force))
- C.update_damage_overlays()
- to_chat(C, "The thorns pierce your bare hand!")
- return TRUE
-
-/obj/item/seeds/datura
- name = "pack of datura seeds"
- desc = "These seeds grow into datura plants."
- icon_state = "seed-datura"
- species = "Datura"
- plantname = "Datura"
- product = /obj/item/reagent_containers/food/snacks/grown/datura
- lifespan = 30
- maturation = 6
- production = 5
- yield = 4
- growthstages = 5
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "datura-grow"
- icon_dead = "datura-dead"
- icon_harvest = "datura-harvest"
- reagents_add = list(/datum/reagent/medicine/morphine = 0.2, /datum/reagent/drug/mushroomhallucinogen = 0.1, /datum/reagent/toxin = 0.05, /datum/reagent/consumable/nutriment = 0.1)
-
-/obj/item/reagent_containers/food/snacks/grown/datura
- seed = /obj/item/seeds/datura
- name = "Datura"
- desc = "The sacred datura root, useful as an anesthetic for surgery and in healing salves, as well as for rites of passage rituals and ceremonies"
- icon_state = "Datura"
- filling_color = "#FFA500"
- bitesize_mod = 2
- foodtype = VEGETABLES
- juice_results = list(/datum/reagent/consumable/ethanol/daturatea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/daturatea
-
-/obj/item/seeds/punga
- name = "pack of punga seeds"
- desc = "These small black pits grow into a punga bush"
- icon_state = "seed-punga"
- species = "punga"
- plantname = "Punga Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/pungafruit
- lifespan = 100
- endurance = 30
- maturation = 10
- production = 5
- yield = 3
- potency = 30
- growthstages = 4
- rarity = 20
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "punga-grow"
- icon_dead = "punga-dead"
- icon_harvest = "punga-harvest"
- genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/medicine/charcoal = 0.1, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/radaway = 0.05)
-
-/obj/item/reagent_containers/food/snacks/grown/pungafruit
- seed = /obj/item/seeds/punga
- name = "pungafruit"
- desc = "Punga fruit plants flower at a single point at the terminus of their stems, gradually developing into large, fleshy fruits with a yellow/brown, thick skin. They are common throughout Point Lookout, due to the unique conditions offered by the swamps, and scrub radiation when ingested."
- icon_state = "Punga Fruit"
- filling_color = "#FF6347"
- juice_results = list(/datum/reagent/consumable/ethanol/pungajuice = 0)
-
-/obj/item/seeds/yucca
- name = "pack of banana yucca seeds"
- desc = "These seeds grow into a yucca plant."
- icon = 'icons/obj/hydroponics/seeds.dmi'
- icon_state = "seed-yucca"
- species = "banna yucca"
- plantname = "Banana Yucca plant"
- product = /obj/item/reagent_containers/food/snacks/grown/yucca
- lifespan = 50
- endurance = 30
- yield = 5
- growthstages = 4
- maturation = 5
- production = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "yucca-grow"
- icon_dead = "yucca-dead"
- icon_harvest = "yucca-harvest"
- genes = list(/datum/plant_gene/trait/repeated_harvest)
- reagents_add = list( /datum/reagent/consumable/nutriment = 0.2, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.2)
-
-
-/obj/item/reagent_containers/food/snacks/grown/yucca
- seed = /obj/item/seeds/yucca
- name = "banana yucca fruit"
- desc = "The fleshy banana like fruit, rougly 8 cm long and 6 cm across. It tastes similar to a sweet potato."
- icon_state = "Bannana Yucca"
- icon = 'icons/obj/hydroponics/harvest.dmi'
- bitesize = 3
- juice_results = list(/datum/reagent/consumable/yuccajuice = 0)
- distill_reagent = /datum/reagent/consumable/yuccajuice
-
-/obj/item/seeds/tato
- name = "pack of tato seeds"
- desc = "a pack of tato seeds"
- icon_state = "seed-tato"
- species = "tato"
- plantname = "Tato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tato
- lifespan = 30
- maturation = 7
- production = 3
- yield = 4
- growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "tato-grow"
- icon_dead = "tato-dead"
- icon_harvest = "tato-harvest"
- genes = list(/datum/plant_gene/trait/battery, /datum/plant_gene/trait/repeated_harvest)
- reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
-
-/obj/item/reagent_containers/food/snacks/grown/tato
- seed = /obj/item/seeds/tato
- name = "tato"
- desc = "The outside looks like a tomato, but the inside is brown. Tastes as absolutely disgusting as it looks, but will keep you from starving."
- icon_state = "Tato"
- filling_color = "#E9967A"
- bitesize = 100
- foodtype = VEGETABLES
- juice_results = list(/datum/reagent/consumable/tato_juice = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/tatovodka
-
-/obj/item/reagent_containers/food/snacks/grown/tato/wedges
- name = "tato wedges"
- desc = "Slices of neatly cut tato."
- icon_state = "potato_wedges"
- filling_color = "#E9967A"
- bitesize = 100
-
-/obj/item/reagent_containers/food/snacks/grown/tato/attackby(obj/item/W, mob/user, params)
- if(W.get_sharpness())
- to_chat(user, "You cut the tato into wedges with [W].")
- var/obj/item/reagent_containers/food/snacks/grown/tato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/tato/wedges
- remove_item_from_storage(user)
- qdel(src)
- user.put_in_hands(Wedges)
- else
- return ..()
-
-
-/obj/item/seeds/mutfruit
- name = "pack of mutfruit seeds"
- desc = "These seeds grow into a mutfruit sapling."
- icon_state = "seed-mutfruit"
- species = "mutfruit"
- plantname = "Mutfruit Sapling"
- growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
- icon_grow = "mutfruit-grow"
- icon_dead = "mutfruit-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/mutfruit
- lifespan = 30
- endurance = 20
- yield = 3
- growthstages = 3
- production = 5
- maturation = 5
- reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/radium = 0.15)
-
-/obj/item/reagent_containers/food/snacks/grown/mutfruit
- seed = /obj/item/seeds/mutfruit
- name = "mutfruit"
- desc = "Mutfruit provides both hydration and sustenance, but the mutated plant also carries small amounts of radiation."
- icon_state = "mutfruit"
- filling_color = "#FF6347"
- distill_reagent = /datum/reagent/consumable/ethanol/purplecider
- juice_results = list(/datum/reagent/consumable/mutjuice = 0)
-
-
-/*HRP*/
-
-
//// LAVALAND MUSHROOMS ////
// Bracket (Shaving mushroom)
@@ -584,6 +101,7 @@
desc = "Cave fungus is an edible mushroom which has the ability to purge bodily toxins."
icon_state = "fungus"
filling_color = "#FF6347"
+ distill_reagent = /datum/reagent/consumable/cavefungusjuice
/obj/item/seeds/glow
name = "pack of glowing fungus seeds"
@@ -615,34 +133,3 @@
filling_color = "#FF6347"
/*MRP*/
-
-
-/obj/item/seeds/agave
- name = "pack of agave seeds"
- desc = "These seeds grow into an agave plant."
- icon = 'icons/obj/hydroponics/seeds.dmi'
- icon_state = "seed-agave"
- species = "agave"
- plantname = "Agave plant"
- product = /obj/item/reagent_containers/food/snacks/grown/agave
- lifespan = 60
- endurance = 10
- yield = 5
- growthstages = 3
- production = 7
- maturation = 7
- growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
- icon_grow = "agave-grow"
- icon_dead = "agave-dead"
- icon_harvest = "agave-harvest"
- reagents_add = list(/datum/reagent/medicine/kelotane = 0.1, /datum/reagent/toxin/lipolicide = 0.1 )
-
-
-/obj/item/reagent_containers/food/snacks/grown/agave
- seed = /obj/item/seeds/agave
- name = "agave leaf"
- desc = "A strange kind of fleshy grass often used as a primitive burn medication that rapidly depletes stored nutrients in the body."
- icon_state = "Agave Leaf"
- icon = 'icons/obj/flora/wastelandflora.dmi'
- juice_results = list(/datum/reagent/consumable/tea/agavetea = 0)
- distill_reagent = /datum/reagent/consumable/ethanol/tequila
diff --git a/code/modules/fallout/obj/smelling_salts.dm b/code/modules/fallout/obj/smelling_salts.dm
index 970c766195..6d208d963c 100644
--- a/code/modules/fallout/obj/smelling_salts.dm
+++ b/code/modules/fallout/obj/smelling_salts.dm
@@ -130,6 +130,6 @@
var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT]
if(policy)
to_chat(revived_mob, policy)
- revived_mob.log_message("revived using strange reagent, [time_since_death / 10] seconds from time of death, considered [late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME)
+ revived_mob.log_message("revived using smelling salts, [time_since_death / 10] seconds from time of death, considered [late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME)
//add_logs(user, revived_mob, "revived (smelling salts)", src)
in_use = FALSE
diff --git a/code/modules/fallout/reagents/alcohol.dm b/code/modules/fallout/reagents/alcohol.dm
index 3fb927b640..453963066b 100644
--- a/code/modules/fallout/reagents/alcohol.dm
+++ b/code/modules/fallout/reagents/alcohol.dm
@@ -25,6 +25,21 @@
M.radiation = max(M.radiation-3,0)
return ..()
+/datum/reagent/consumable/ethanol/buffalo
+ name = "buffalo juice"
+ description = "The fermented liquid of the buffalo gourd. Very bitter."
+ color = "#706A58"
+ boozepwr = 100
+ taste_description = "bitter boozey sludge"
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of fermented buffalo juice"
+ glass_desc = "The fermented liquid of the buffalo gourd. Very bitter."
+
+/datum/reagent/consumable/ethanol/buffalo/on_mob_life(mob/living/carbon/M)
+ if(M.disgust < 80)
+ M.adjust_disgust(10)
+ return ..()
+
/datum/reagent/consumable/ethanol/pungajuice
name = "punga juice"
description = "The fermented juice of the punga fruit, used to treat radiation sickness"
@@ -401,6 +416,7 @@
glass_name = "Nuka Quantum"
glass_desc = "An extremely blue and glowing combination of Nuka-Cola and (REDACTED)"
var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
+
/datum/reagent/consumable/ethanol/nukaquantum/on_mob_life(mob/living/carbon/M)
M.drowsyness = 0
@@ -414,6 +430,9 @@
M.adjustStaminaLoss(-3, 0)
M.hallucination += 20
M.Jitter(2)
+ if(HAS_TRAIT(M, TRAIT_NUKA_LOVER))
+ M.adjustBruteLoss(-0.1)
+ M.adjustFireLoss(-0.1)
ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, "[type]")
if(iscarbon(M))
var/mob/living/carbon/C = M
diff --git a/code/modules/fallout/reagents/drinks.dm b/code/modules/fallout/reagents/drinks.dm
index e6d0767b5f..bc4572d832 100644
--- a/code/modules/fallout/reagents/drinks.dm
+++ b/code/modules/fallout/reagents/drinks.dm
@@ -6,13 +6,21 @@
glass_icon_state = "nukacolaglass"
glass_name = "Nuka Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
+ overdose_threshold = 100
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
M.drowsyness = 0
M.AdjustSleeping(-40, FALSE)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+ if(HAS_TRAIT(M, TRAIT_NUKA_LOVER))
+ M.adjustBruteLoss(-0.05)
+ M.adjustFireLoss(-0.05)
..()
- . = TRUE
+
+/datum/reagent/consumable/nuka_cola/overdose_start(mob/living/M)
+ to_chat(M, "Too much Nuka-Cola! This cannot be good for you!")
+ M.AdjustSleeping(600, FALSE)
+ . = 1
/datum/reagent/consumable/sunset
name = "Sunset Sarsaparilla"
@@ -191,14 +199,22 @@
glass_icon_state = "nukaiceglass"
glass_name = "Iced Nuka"
glass_desc = "Nuka. Stay frosty."
-
+
/datum/reagent/consumable/nukaice/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
M.drowsyness = 0
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+ if(HAS_TRAIT(M, TRAIT_NUKA_LOVER))
+ M.adjustBruteLoss(-0.075)
+ M.adjustFireLoss(-0.075)
..()
. = TRUE
+/datum/reagent/consumable/nukaice/overdose_start(mob/living/M)
+ to_chat(M, "Too much Nuka-Cola! This cannot be good for you!")
+ M.AdjustSleeping(600, FALSE)
+ . = 1
+
/datum/reagent/consumable/nukawild
name = "Nuka Wild"
description = "A totally original concept of Nuka-Cola!"
diff --git a/code/modules/fallout/reagents/drugs.dm b/code/modules/fallout/reagents/drugs.dm
index 5a26aa1448..285e8a2b2d 100644
--- a/code/modules/fallout/reagents/drugs.dm
+++ b/code/modules/fallout/reagents/drugs.dm
@@ -15,7 +15,7 @@
if(isliving(M))
to_chat(M, "You come down from your high. The wild ride is unfortunately over...")
M.confused += 2
-
+
/datum/reagent/drug/jet/on_mob_life(mob/living/carbon/M)
M.adjustStaminaLoss(-20, 0)
M.set_drugginess(20)
diff --git a/code/modules/fallout/reagents/medicines.dm b/code/modules/fallout/reagents/medicines.dm
index 1d8504047b..0cdd843536 100644
--- a/code/modules/fallout/reagents/medicines.dm
+++ b/code/modules/fallout/reagents/medicines.dm
@@ -21,6 +21,7 @@
..()
/datum/reagent/medicine/stimpak/on_mob_life(mob/living/carbon/M)
+ M.adjust_nutrition(-2)
if(M.health < 0) //Functions as epinephrine.
M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
@@ -41,11 +42,13 @@
if(!M.reagents.has_reagent(/datum/reagent/medicine/healing_powder)) // We don't want these healing items to stack, so we only apply the healing if these chems aren't found.We only check for the less powerful chems, so the least powerful one always heals.
M.adjustBruteLoss(-4*REAGENTS_EFFECT_MULTIPLIER)
M.adjustFireLoss(-4*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
M.AdjustStun(-5*REAGENTS_EFFECT_MULTIPLIER, 0)
M.AdjustKnockdown(-5*REAGENTS_EFFECT_MULTIPLIER, 0)
M.adjustStaminaLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
. = TRUE
+ if(M.nutrition <= NUTRITION_LEVEL_STARVING - 50)
+ M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER, 0)
+ M.overeatduration = 0
..()
/datum/reagent/medicine/stimpak/overdose_process(mob/living/M)
@@ -64,7 +67,7 @@
description = "Rapidly heals damage when injected. A poor man's stimpak."
reagent_state = LIQUID
color = "#FFA500"
-
+
/datum/reagent/medicine/stimpakimitation/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() == 0 && M.getFireLoss() == 0)
metabolization_rate = 1000 * REAGENTS_METABOLISM //instant metabolise if it won't help you, prevents prehealing before combat
@@ -85,6 +88,7 @@
addiction_threshold = 16
datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
+ M.adjust_nutrition(-3)
if(M.health < 0) //Functions as epinephrine.
M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
@@ -105,11 +109,13 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
if(!M.reagents.has_reagent(/datum/reagent/medicine/healing_powder/poultice) && !M.reagents.has_reagent(/datum/reagent/medicine/stimpak) && !M.reagents.has_reagent(/datum/reagent/medicine/healing_powder)) // We don't want these healing items to stack, so we only apply the healing if these chems aren't found. We only check for the less powerful chems, so the least powerful one always heals.
M.adjustBruteLoss(-8*REAGENTS_EFFECT_MULTIPLIER)
M.adjustFireLoss(-8*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
M.AdjustStun(-10*REAGENTS_EFFECT_MULTIPLIER, 0)
M.AdjustKnockdown(-10*REAGENTS_EFFECT_MULTIPLIER, 0)
M.adjustStaminaLoss(-4*REAGENTS_EFFECT_MULTIPLIER)
. = TRUE
+ if(M.nutrition <= NUTRITION_LEVEL_STARVING - 50)
+ M.adjustToxLoss(3*REAGENTS_EFFECT_MULTIPLIER, 0)
+ M.overeatduration = 0
..()
/datum/reagent/medicine/super_stimpak/overdose_process(mob/living/M)
@@ -117,7 +123,7 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
M.adjustOxyLoss(12*REAGENTS_EFFECT_MULTIPLIER)
..()
. = TRUE
-
+
// ---------------------------
// LONGPORK STEW REAGENT
@@ -158,7 +164,7 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
reagent_state = SOLID
color = "#7f7add"
taste_description = "heaven."
- metabolization_rate = 0.7 * REAGENTS_METABOLISM
+ metabolization_rate = 0.7 * REAGENTS_METABOLISM
overdose_threshold = 30 //hard to OD on, besides if you use too much it kills you when it wears off
/datum/reagent/medicine/berserker_powder/on_mob_life(mob/living/carbon/M)
@@ -233,6 +239,7 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
var/heal_factor_perk = -5 //Multiplier if you have the right perk.
/datum/reagent/medicine/bitter_drink/on_mob_life(mob/living/carbon/M)
+ M.set_blurriness(7)
var/is_tribal = FALSE
if(HAS_TRAIT(M, TRAIT_TRIBAL))
is_tribal = TRUE
@@ -300,13 +307,17 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
// HEALING POULTICE REAGENT
/datum/reagent/medicine/healing_powder/poultice
- name = "ealing poultice"
+ name = "Healing poultice"
description = "Restores limb condition and heals rapidly."
color = "#C8A5DC"
overdose_threshold = 20
heal_factor = -2
heal_factor_perk = -4
+/datum/reagent/medicine/healing_powder/poultice/on_mob_life(mob/living/carbon/M)
+ M.set_blurriness(5)
+ ..()
+
// ---------------------------
// RAD-X REAGENT
@@ -363,14 +374,14 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
..()
if(isliving(M))
to_chat(M, "You feel tougher, able to shrug off pain more easily.")
- M.maxHealth += 100
- M.health += 100
+ M.maxHealth += 70
+ M.health += 70
/datum/reagent/medicine/medx/on_mob_delete(mob/living/carbon/human/M)
if(isliving(M))
to_chat(M, "You feel as vulnerable to pain as a normal person.")
- M.maxHealth -= 100
- M.health -= 100
+ M.maxHealth -= 70
+ M.health -= 70
switch(current_cycle)
if(1 to 40)
M.confused += 10
@@ -402,7 +413,7 @@ datum/reagent/medicine/super_stimpak/on_mob_life(mob/living/M)
M.set_heartattack(TRUE)
M.visible_message("[M] clutches at their chest as if their heart stopped!")
to_chat(M, "Your vision goes black and your heart stops beating as the amount of drugs in your system shut down your organs one by one. Say hello to Elvis in the afterlife. ")
-
+
..()
/datum/reagent/medicine/medx/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/fallout/reagents/teas.dm b/code/modules/fallout/reagents/teas.dm
index bf833267ce..7c31149a8a 100644
--- a/code/modules/fallout/reagents/teas.dm
+++ b/code/modules/fallout/reagents/teas.dm
@@ -46,28 +46,7 @@
..()
. = TRUE
-/datum/reagent/consumable/tea/broctea
- name = "Broc Tea"
- description = "A soothing herbal rememedy steeped from the Broc Flower. Increases the clearance and flow of airways."
- color = "#FF6347"
- nutriment_factor = 0
- taste_description = "bitterness"
- glass_icon_state = "tea"
- glass_name = "Broc Tea"
- glass_desc = "A soothing herbal rememedy steeped from the Broc Flower. Increases the clearance and flow of airways."
-/datum/reagent/consumable/tea/broctea/on_mob_life(mob/living/carbon/M)
- M.adjustOxyLoss(-4*REAGENTS_EFFECT_MULTIPLIER, 0)
- M.nutrition = max(M.nutrition - 3, 0)
- M.dizziness = max(0,M.dizziness-2)
- M.drowsyness = max(0,M.drowsyness-1)
- M.jitteriness = max(0,M.jitteriness-3)
- M.AdjustSleeping(-20, FALSE)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1, 0)
- M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
- ..()
- . = TRUE
/datum/reagent/consumable/tea/coyotetea
name = "Coyote Tea"
@@ -97,34 +76,6 @@
..()
. = TRUE
-/datum/reagent/consumable/tea/coyotetea
- name = "Coyote Tea"
- description = "A smokey herbal rememedy steeped from coyote tobacco stems. Natural caffeines keep the drinker alert and awake while numbing the senses."
- color = "#008000"
- nutriment_factor = 0
- taste_description = "smoke"
- glass_icon_state = "chocolateglass"
- glass_name = "Coyote Tea"
- glass_desc = "A smokey herbal rememedy steeped from coyote tobacco stems. Natural caffeines keep the drinker alert and awake while numbing the senses."
-
-/datum/reagent/consumable/tea/coyotetea/on_mob_life(mob/living/carbon/M)
- if(prob(10))
- var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.")
- to_chat(M, "[smoke_message]")
- M.AdjustStun(-40, 0)
- M.AdjustKnockdown(-40, 0)
- M.AdjustUnconscious(-40, 0)
- M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER, 0)
- M.dizziness = max(0,M.dizziness-2)
- M.drowsyness = max(0,M.drowsyness-1)
- M.jitteriness = max(0,M.jitteriness-3)
- M.AdjustSleeping(-20, FALSE)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1, 0)
- M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
- ..()
- . = TRUE
-
/datum/reagent/consumable/tea/feratea
name = "Barrel Tea"
description = "A sour and dry rememedy steeped from barrel cactus fruit. Detoxifies the user through natural filteration and dehydration."
@@ -158,13 +109,13 @@
/datum/reagent/consumable/tea/pricklytea
name = "Prickly Tea"
- description = "A sweet and fruitfel rememedy steeped from barrel cactus fruit. Keeps you on edge."
+ description = "A sweet and fruity rememedy steeped from prickly pear fruit. Keeps you on edge."
color = "#FF6347"
nutriment_factor = 0
taste_description = "sweetness"
glass_icon_state = "cafe_latte"
glass_name = "Prickly Tea"
- glass_desc = "A sour and dry rememedy steeped from barrel cactus fruit. Keeps you on edge."
+ glass_desc = "A sweet and fruity rememedy steeped from prickly pear fruit. Keeps you on edge."
/datum/reagent/consumable/tea/pricklytea/on_mob_life(mob/living/carbon/M)
if(prob(33))
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index b1d3170df2..8db85a0171 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -31,7 +31,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(!hallucination)
return
- hallucination--
+ hallucination = max(hallucination-1, 0)
if(world.time < next_hallucination)
return
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 6a92e2385d..ec6a5e12f0 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -139,7 +139,7 @@
icon = 'icons/obj/f13vending.dmi'
icon_state = "nukacola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 25, /datum/reagent/radium = 5)
- foodtype = SUGAR
+ foodtype = NUKA
isGlass = TRUE
/obj/item/reagent_containers/food/drinks/bottle/f13nukacola/radioactive
@@ -152,7 +152,6 @@
icon = 'icons/obj/f13vending.dmi'
icon_state = "sunset"
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/sunset = 15, /datum/reagent/medicine/salglu_solution = 5)
- foodtype = SUGAR
isGlass = TRUE
@@ -693,6 +692,7 @@
desc = "You've really hit rock bottom now... yet theres nothing like homebrew nukashine in times like these!"
icon_state = "nukashine"
list_reagents = list(/datum/reagent/consumable/ethanol/nukashine = 100)
+ foodtype = NUKA
// Empty bottles
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 8e5069925f..b73aba113e 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -92,6 +92,12 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
+ foodtype = NUKA
+
+obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_float
+ name = "Nuka Float"
+ list_reagents = list(/datum/reagent/consumable/nukafloat = 50)
+ foodtype = NUKA
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
name = "Syndicate Bomb"
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 7ccd501f2e..d5c1c95dbf 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -860,7 +860,7 @@
results = list(/datum/reagent/consumable/ethanol/commander_and_chief = 50)
required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
mix_message = "When your powers combine, I am Captain Pl-..."
-
+
/datum/chemical_reaction/cherryshake
name = "Cherry Shake"
id = /datum/reagent/consumable/cherryshake
@@ -949,7 +949,7 @@
name = "Cold Scales"
id = /datum/reagent/consumable/ethanol/species_drink/coldscales
results = list(/datum/reagent/consumable/ethanol/species_drink/coldscales = 3)
- required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/toxin/slimejelly = 1, /datum/reagent/consumable/menthol = 1)
+ required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/celugel = 1, /datum/reagent/consumable/menthol = 1)
/datum/chemical_reaction/oil_drum
name = "Oil Drum"
@@ -1010,7 +1010,7 @@
name = "Jell Wyrm"
id = /datum/reagent/consumable/ethanol/species_drink/jell_wyrm
results = list(/datum/reagent/consumable/ethanol/species_drink/jell_wyrm = 2)
- required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5)
+ required_reagents = list(/datum/reagent/celugel = 1, /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5)
required_temp = 333 // (59.85'C)
/datum/chemical_reaction/laval_spit
@@ -1019,7 +1019,7 @@
results = list(/datum/reagent/consumable/ethanol/species_drink/laval_spit = 20) //Limited use
required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/ethanol/mauna_loa = 10, /datum/reagent/sulfur = 5)
required_temp = 900 // (626.85'C)
-
+
///nuka variants
/datum/chemical_reaction/nukafloat
@@ -1039,7 +1039,7 @@
id = /datum/reagent/consumable/ethanol/nukashine
results = list(/datum/reagent/consumable/ethanol/nukashine = 2)
required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/consumable/ethanol/beer = 1)
-
+
/datum/chemical_reaction/rotgut
name = "Rotgut"
id = /datum/reagent/consumable/ethanol/rotgut
@@ -1051,25 +1051,25 @@
id = /datum/reagent/consumable/ethanol/nukavictory
results = list(/datum/reagent/consumable/ethanol/nukavictory = 2)
required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/consumable/ethanol/thirteenloko = 1)
-
+
/datum/chemical_reaction/nukaquartz
name = "Nuka Quartz"
id = /datum/reagent/consumable/nukaquartz
results = list(/datum/reagent/consumable/nukaquartz = 3)
required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 1)
-
+
/datum/chemical_reaction/nukacherry
name = "Nuka Cherry"
id = /datum/reagent/consumable/nukacherry
results = list(/datum/reagent/consumable/nukacherry = 4)
required_reagents = list(/datum/reagent/consumable/nuka_cola = 3, /datum/reagent/consumable/cherryjelly = 1)
-
+
/datum/chemical_reaction/nukalove
name = "Nuka Love"
id = /datum/reagent/consumable/ethanol/nukalove
results = list(/datum/reagent/consumable/ethanol/nukalove = 2)
required_reagents = list(/datum/reagent/consumable/nukacherry = 1, /datum/reagent/consumable/nukaquartz = 1)
-
+
/datum/chemical_reaction/nukaquantum
name = "Nuka Quantum"
id = /datum/reagent/consumable/ethanol/nukaquantum
@@ -1386,3 +1386,44 @@
results = list(/datum/reagent/consumable/yuccashake = 3)
required_reagents = list(/datum/reagent/consumable/yuccajuice = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cream = 1)
+/datum/chemical_reaction/broctea
+ name = "Broc Tea"
+ id = "broctea"
+ results = list(/datum/reagent/consumable/tea/broctea = 3)
+ required_reagents = list(/datum/reagent/consumable/brocjuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
+
+/datum/chemical_reaction/xandertea
+ name = "Xander Tea"
+ id = "xandertea"
+ results = list(/datum/reagent/consumable/tea/xandertea = 3)
+ required_reagents = list(/datum/reagent/consumable/xanderjuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
+
+/datum/chemical_reaction/agavetea
+ name = "Agave Tea"
+ id = "agavetea"
+ results = list(/datum/reagent/consumable/tea/agavetea = 3)
+ required_reagents = list(/datum/reagent/consumable/agavejuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
+
+/datum/chemical_reaction/feratea
+ name = "Barrel Tea"
+ id = "feratea"
+ results = list(/datum/reagent/consumable/tea/feratea = 3)
+ required_reagents = list(/datum/reagent/consumable/ferajuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
+
+/datum/chemical_reaction/daturatea
+ name = "Datura Tea"
+ id = "daturatea"
+ results = list(/datum/reagent/consumable/ethanol/daturatea = 3)
+ required_reagents = list(/datum/reagent/consumable/daturajuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
+
+/datum/chemical_reaction/coyotetea
+ name = "Coyote Tea"
+ id = "coyotetea"
+ results = list(/datum/reagent/consumable/tea/coyotetea = 3)
+ required_reagents = list(/datum/reagent/consumable/coyotejuice = 1, /datum/reagent/water = 2)
+ required_temp = 315
diff --git a/code/modules/hydroponics/grown/agave.dm b/code/modules/hydroponics/grown/agave.dm
index 8f7630de92..1b49545d69 100644
--- a/code/modules/hydroponics/grown/agave.dm
+++ b/code/modules/hydroponics/grown/agave.dm
@@ -1,11 +1,10 @@
-
/obj/item/seeds/agave
name = "pack of agave seeds"
desc = "These seeds grow into an agave plant."
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed-agave"
species = "agave"
- plantname = "agave plant"
+ plantname = "Agave plant"
product = /obj/item/reagent_containers/food/snacks/grown/agave
lifespan = 60
endurance = 10
@@ -17,7 +16,7 @@
icon_grow = "agave-grow"
icon_dead = "agave-dead"
icon_harvest = "agave-harvest"
- reagents_add = list(/datum/reagent/medicine/kelotane = 0.05, /datum/reagent/toxin/lipolicide = 0.05, /datum/reagent/nitrogen = 0.05, /datum/reagent/oxygen = 0.05)
+ reagents_add = list(/datum/reagent/medicine/kelotane = 0.1, /datum/reagent/toxin/lipolicide = 0.1 )
/obj/item/reagent_containers/food/snacks/grown/agave
@@ -26,5 +25,5 @@
desc = "A strange kind of fleshy grass often used as a primitive burn medication that rapidly depletes stored nutrients in the body."
icon_state = "Agave Leaf"
icon = 'icons/obj/flora/wastelandflora.dmi'
- juice_results = list(/datum/reagent/agavetea = 0)
+ juice_results = list(/datum/reagent/consumable/agavejuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/tequila
diff --git a/code/modules/hydroponics/grown/broc.dm b/code/modules/hydroponics/grown/broc.dm
index dc78440a15..c00c580f66 100644
--- a/code/modules/hydroponics/grown/broc.dm
+++ b/code/modules/hydroponics/grown/broc.dm
@@ -3,7 +3,7 @@
desc = "These seeds grow into broc flowers."
icon_state = "seed-broc"
species = "broc"
- plantname = "broc flowers"
+ plantname = "Broc Flowers"
product = /obj/item/reagent_containers/food/snacks/grown/broc
lifespan = 25
endurance = 10
@@ -12,22 +12,17 @@
production = 4
maturation = 4
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
- //mutatelist = list(/obj/item/seeds/geraniumseed, /obj/item/seeds/lilyseed)
+ icon_harvest = "broc-harvest"
+ icon_grow = "broc-grow"
+ icon_dead = "broc-dead"
+ mutatelist = list(/obj/item/seeds/poppy/lily) //spaceman's trumpet
+ reagents_add = list(/datum/reagent/medicine/dexalin = 0.2, /datum/reagent/medicine/salglu_solution = 0.05, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/bicaridine = 0.1,)
/obj/item/reagent_containers/food/snacks/grown/broc
seed = /obj/item/seeds/poppy/broc
name = "broc flower"
desc = "This vibrant, orange flower grows on tall stalks in the wasteland and exhibits moderate healing properties, even when unprocessed."
icon_state = "broc"
- //slot_flags = SLOT_HEAD
filling_color = "#FF6347"
- juice_results = list(/datum/reagent/broctea = 0)
+ juice_results = list(/datum/reagent/consumable/brocjuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/brocbrew
-
-
-/obj/item/reagent_containers/food/snacks/grown/broc/add_juice()
- if(..())
- reagents.add_reagent(/datum/reagent/dexalin, 1 + round((seed.potency / 5), 1))
- reagents.add_reagent(/datum/reagent/medicine/salglu_solution, 1 + round((seed.potency / 20), 1))
- reagents.add_reagent(/datum/reagent/consumable/brocjuice, 1 + round((seed.potency / 5), 1))
- bitesize = 1 + round(reagents.total_volume / 3, 1)
diff --git a/code/modules/hydroponics/grown/buffalogourd.dm b/code/modules/hydroponics/grown/buffalogourd.dm
index 2eb1ae0566..1289bba5ec 100644
--- a/code/modules/hydroponics/grown/buffalogourd.dm
+++ b/code/modules/hydroponics/grown/buffalogourd.dm
@@ -1,15 +1,20 @@
+/obj/item/reagent_containers/food/snacks/roastseeds/buffalogourd
+ name = "roasted gourd seeds"
+ desc = "Well prepared crispy buffalo gourd seeds, full of chewy protein."
+ list_reagents = list(/datum/reagent/consumable/cooking_oil = 1, /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1.5)
+
/obj/item/seeds/buffalogourd
name = "pack of buffalo gourd seeds"
- desc = "These seeds grow into buffalo vines."
+ desc = "These seeds grow into buffalo vines.
they appear to be edible once cooked!"
icon_state = "seed-gourd"
species = "buffalo gourd"
- plantname = "buffalo vines"
+ plantname = "Buffalo Vines"
product = /obj/item/reagent_containers/food/snacks/grown/buffalogourd
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_grow = "gourd-grow"
icon_dead = "gourd-dead"
- icon_harvest = "tato-harvest"
- reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2)
+ icon_harvest = "gourd-harvest"
+ reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/toxin = 0.1)
lifespan = 50
endurance = 40
maturation = 10
@@ -17,13 +22,23 @@
yield = 3
growthstages = 3
+/obj/item/seeds/buffalogourd/microwave_act(obj/machinery/microwave/MW) //The act allows it to be cooked over a bonfire grille too.
+ ..()
+ new /obj/item/reagent_containers/food/snacks/roastseeds/buffalogourd(drop_location())
+ qdel(src)
+
+/obj/item/reagent_containers/food/snacks/roastseeds/buffalogourd
+ name = "roasted gourd seeds"
+ desc = "Well prepared crispy buffalo gourd seeds, full of chewy protein."
+ list_reagents = list(/datum/reagent/consumable/cooking_oil = 1, /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1.5)
+
/obj/item/reagent_containers/food/snacks/grown/buffalogourd
seed = /obj/item/seeds/buffalogourd
name = "buffalo gourd"
- desc = "It's full of watery goodness."
- icon_state = "Buffalo Gourd"
- w_class = WEIGHT_CLASS_NORMAL
+ desc = "A bitter tasting vine plant, with a watery fleshy texture."
+ icon_state = "buffalo_gourd"
filling_color = "#008000"
bitesize_mod = 3
- foodtype = FRUIT
+ foodtype = FRUIT | GROSS
+ juice_results = list(/datum/reagent/lye= 0.5) // The oil made from the gourd plant itself is used in Native American soap.
distill_reagent = /datum/reagent/consumable/ethanol/buffalo
diff --git a/code/modules/hydroponics/grown/coyotetobacco.dm b/code/modules/hydroponics/grown/coyotetobacco.dm
index 26d6f40a07..6ad61d1809 100644
--- a/code/modules/hydroponics/grown/coyotetobacco.dm
+++ b/code/modules/hydroponics/grown/coyotetobacco.dm
@@ -15,7 +15,7 @@
icon_grow = "coyote-grow"
icon_dead = "coyote-dead"
icon_harvest = "coyote-harvest"
- reagents_add = list(/datum/reagent/drug/nicotine = 0.03, /datum/reagent/consumable/nutriment = 0.03)
+ reagents_add = list(/datum/reagent/drug/nicotine = 0.1, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/coyotetobacco
seed = /obj/item/seeds/coyotetobacco
@@ -23,5 +23,5 @@
desc = "This tobacco like plant is commonly used by tribals for a great variety of medicinal and ceremonial purposes."
icon_state = "Coyote Tobacco"
filling_color = "#008000"
- juice_results = list(/datum/reagent/consumable/coyotetea = 0)
+ juice_results = list(/datum/reagent/consumable/coyotejuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/deathroach
diff --git a/code/modules/hydroponics/grown/datura.dm b/code/modules/hydroponics/grown/datura.dm
index 0624e3f3cc..ae7672af79 100644
--- a/code/modules/hydroponics/grown/datura.dm
+++ b/code/modules/hydroponics/grown/datura.dm
@@ -6,23 +6,23 @@
plantname = "Datura"
product = /obj/item/reagent_containers/food/snacks/grown/datura
lifespan = 30
- maturation = 10
- production = 1
+ maturation = 6
+ production = 5
yield = 4
growthstages = 5
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_grow = "datura-grow"
icon_dead = "datura-dead"
icon_harvest = "datura-harvest"
- reagents_add = list(/datum/reagent/medicine/morphine = 0.35, /datum/reagent/drug/mushroomhallucinogen = 0.12, /datum/reagent/toxin = 0.3, /datum/reagent/consumable/nutriment = 0.05)
+ reagents_add = list(/datum/reagent/medicine/morphine = 0.2, /datum/reagent/drug/mushroomhallucinogen = 0.1, /datum/reagent/toxin = 0.05, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/datura
seed = /obj/item/seeds/datura
- name = "datura-harvest"
+ name = "Datura"
desc = "The sacred datura root, useful as an anesthetic for surgery and in healing salves, as well as for rites of passage rituals and ceremonies"
icon_state = "Datura"
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
- juice_results = list(/datum/reagent/consumable/ethanol/daturatea = 0)
+ juice_results = list(/datum/reagent/consumable/daturajuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/daturatea
diff --git a/code/modules/hydroponics/grown/feracactus.dm b/code/modules/hydroponics/grown/feracactus.dm
index 3283256d1d..d2372dc17c 100644
--- a/code/modules/hydroponics/grown/feracactus.dm
+++ b/code/modules/hydroponics/grown/feracactus.dm
@@ -1,3 +1,4 @@
+
/obj/item/seeds/feracactus
name = "pack of barrel cactus seeds"
desc = "These seeds grow into a barrel cactus."
@@ -7,7 +8,7 @@
icon_dead = "feracactus-dead"
icon_harvest = "feracactus-harvest"
species = "barrel cactus"
- plantname = "barrel cactus"
+ plantname = "Barrel Cactus"
product = /obj/item/reagent_containers/food/snacks/grown/feracactus
lifespan = 60
endurance = 20
@@ -15,20 +16,14 @@
growthstages = 2
production = 5
maturation = 5
-
+ reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/calomel = 0.1,)
/obj/item/reagent_containers/food/snacks/grown/feracactus
seed = /obj/item/seeds/feracactus
name = "barrel cactus fruit"
- desc = "Barrel cactus fruit are found on spherical barrel cacti and are both nutritious and highly toxic."
+ desc = "Carefully harvested spineless barrel-cactus fruit, it feels dry to the touch but appears more than edible."
icon_state = "feracactus"
filling_color = "#FF6347"
- juice_results = list(/datum/reagent/consumable/feratea = 0)
- distill_reagent = /datum/reagent/consumable/yellowpulque
-
-/obj/item/reagent_containers/food/snacks/grown/feracactus/add_juice()
- if(..())
- reagents.add_reagent(/datum/reagent/consumable/nutriment, 3 + round((seed.potency / 20), 1))
- reagents.add_reagent(/datum/reagent/calomel, 3 + round((seed.potency / 20), 1))
- reagents.add_reagent(/datum/reagent/radium, 0 + round((seed.potency / 20), 1))
- bitesize = 3 + round(reagents.total_volume / 3, 1)
+ foodtype = FRUIT
+ juice_results = list(/datum/reagent/consumable/ferajuice = 0)
+ distill_reagent = /datum/reagent/consumable/ethanol/yellowpulque
diff --git a/code/modules/hydroponics/grown/horsenettle.dm b/code/modules/hydroponics/grown/horsenettle.dm
index 7c70ee704a..499aba1ef3 100644
--- a/code/modules/hydroponics/grown/horsenettle.dm
+++ b/code/modules/hydroponics/grown/horsenettle.dm
@@ -14,7 +14,7 @@
icon_dead = "horsenettle-dead"
icon_harvest = "horsenettle-harvest"
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
- reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+ reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/horsenettle
seed = /obj/item/seeds/horsenettle
diff --git a/code/modules/hydroponics/grown/mesquite.dm b/code/modules/hydroponics/grown/mesquite.dm
index a26c1d0d6e..8afe1ea4fb 100644
--- a/code/modules/hydroponics/grown/mesquite.dm
+++ b/code/modules/hydroponics/grown/mesquite.dm
@@ -1,14 +1,14 @@
/obj/item/seeds/mesquite
name = "pack of honey mesquite seeds"
- desc = "This mycelium grows into tower-cap mushrooms."
+ desc = "These seeds grows into a mesquite plant."
icon_state = "mycelium-tower"
species = "honey mesquite"
- plantname = "honey mesquite"
+ plantname = "Honey Mesquite"
product = /obj/item/reagent_containers/food/snacks/grown/mesquite
lifespan = 80
endurance = 50
- maturation = 15
- production = 1
+ maturation = 6
+ production = 5
yield = 5
potency = 50
growthstages = 4
@@ -17,6 +17,7 @@
icon_dead = "mesquite-dead"
icon_harvest = "mesquite-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list(/datum/reagent/consumable/honey = 0.1, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/mesquite
seed = /obj/item/seeds/mesquite
@@ -27,6 +28,6 @@
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = VEGETABLES
- juice_results = list(/datum/reagent/consumable/honey = 0)
+ juice_results = list(/datum/reagent/consumable/honey = 0.1)
tastes = list("crunchy sweetness" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/wastemead
diff --git a/code/modules/hydroponics/grown/mutfruit.dm b/code/modules/hydroponics/grown/mutfruit.dm
index f26e3e41d3..0d3a08b1a5 100644
--- a/code/modules/hydroponics/grown/mutfruit.dm
+++ b/code/modules/hydroponics/grown/mutfruit.dm
@@ -3,7 +3,7 @@
desc = "These seeds grow into a mutfruit sapling."
icon_state = "seed-mutfruit"
species = "mutfruit"
- plantname = "mutfruit sapling"
+ plantname = "Mutfruit Sapling"
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "mutfruit-grow"
icon_dead = "mutfruit-dead"
@@ -14,6 +14,7 @@
growthstages = 3
production = 5
maturation = 5
+ reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/radium = 0.15)
/obj/item/reagent_containers/food/snacks/grown/mutfruit
seed = /obj/item/seeds/mutfruit
@@ -21,13 +22,5 @@
desc = "Mutfruit provides both hydration and sustenance, but the mutated plant also carries small amounts of radiation."
icon_state = "mutfruit"
filling_color = "#FF6347"
- distill_reagent = /datum/reagent/consumable/purplecider
+ distill_reagent = /datum/reagent/consumable/ethanol/purplecider
juice_results = list(/datum/reagent/consumable/mutjuice = 0)
-
-/obj/item/reagent_containers/food/snacks/grown/mutfruit/add_juice()
- if(..())
- reagents.add_reagent(/datum/reagent/consumable/nutriment, 3 + round((seed.potency / 20), 1))
- reagents.add_reagent(/datum/reagent/radium, 1 + round((seed.potency / 20), 1))
- bitesize = 1 + round(reagents.total_volume / 3, 1)
-
-/*HRP*/
diff --git a/code/modules/hydroponics/grown/pinyon.dm b/code/modules/hydroponics/grown/pinyon.dm
index 6b181a0a85..3ed8c2d57e 100644
--- a/code/modules/hydroponics/grown/pinyon.dm
+++ b/code/modules/hydroponics/grown/pinyon.dm
@@ -7,8 +7,8 @@
product = /obj/item/reagent_containers/food/snacks/grown/pinyon
lifespan = 80
endurance = 50
- maturation = 15
- production = 1
+ maturation = 9
+ production = 6
yield = 5
potency = 50
growthstages = 4
@@ -17,7 +17,7 @@
icon_dead = "pinyon-dead"
icon_harvest = "pinyon-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/consumable/nutriment = 0.04)
+ reagents_add = list( /datum/reagent/consumable/nutriment = 0.05)
/obj/item/reagent_containers/food/snacks/grown/pinyon
seed = /obj/item/seeds/pinyon
diff --git a/code/modules/hydroponics/grown/prickly.dm b/code/modules/hydroponics/grown/prickly.dm
index 53d17f3c46..542dbd6ff4 100644
--- a/code/modules/hydroponics/grown/prickly.dm
+++ b/code/modules/hydroponics/grown/prickly.dm
@@ -7,10 +7,10 @@
icon_dead = "prickly-dead"
icon_harvest = "prickly-harvest"
species = "prickly pear"
- plantname = "prickly pear"
+ plantname = "Prickly pear cactus"
genes = list(/datum/plant_gene/trait/repeated_harvest)
product = /obj/item/reagent_containers/food/snacks/grown/pricklypear
- reagents_add = list(/datum/reagent/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.2, /datum/reagent/water = 0.04)
+ reagents_add = list(/datum/reagent/consumable/nutriment = 0.2, /datum/reagent/water = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.05)
lifespan = 60
endurance = 20
yield = 2
@@ -26,7 +26,7 @@
filling_color = "#FF6347"
foodtype = FRUIT
bitesize_mod = 2
- juice_results = list(/datum/reagent/pricklytea = 0)
+ juice_results = list(/datum/reagent/consumable/tea/pricklytea = 0)
tastes = list("sweet cactus" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/pinkpulque
@@ -37,8 +37,6 @@
var/mob/living/carbon/C = user
if(C.gloves)
return FALSE
- if(C.has_trait(TRAIT_PIERCEIMMUNE))
- return FALSE
var/hit_zone = (C.held_index_to_dir(C.active_hand_index) == "l" ? "l_":"r_") + "arm"
var/obj/item/bodypart/affecting = C.get_bodypart(hit_zone)
if(affecting)
diff --git a/code/modules/hydroponics/grown/punga.dm b/code/modules/hydroponics/grown/punga.dm
index 314e2ca660..badc996503 100644
--- a/code/modules/hydroponics/grown/punga.dm
+++ b/code/modules/hydroponics/grown/punga.dm
@@ -3,12 +3,12 @@
desc = "These small black pits grow into a punga bush"
icon_state = "seed-punga"
species = "punga"
- plantname = "punga bush"
+ plantname = "Punga Bush"
product = /obj/item/reagent_containers/food/snacks/grown/pungafruit
lifespan = 100
endurance = 30
- maturation = 15
- production = 1
+ maturation = 10
+ production = 5
yield = 3
potency = 30
growthstages = 4
@@ -18,18 +18,12 @@
icon_dead = "punga-dead"
icon_harvest = "punga-harvest"
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/medicine/charcoal = 0.1, /datum/reagent/phosphorus = 0.1, /datum/reagent/consumable/nutriment = 0.04)
+ reagents_add = list(/datum/reagent/medicine/charcoal = 0.1, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/medicine/radaway = 0.05)
/obj/item/reagent_containers/food/snacks/grown/pungafruit
seed = /obj/item/seeds/punga
name = "pungafruit"
- desc = "Punga fruit plants flower at a single point at the terminus of their stems, gradually developing into large, fleshy fruits with a yellow/brown, thick skin. They are common throughout Point Lookout, due to the unique conditions offered by the swamps, and the further unique function of scrubbing radiation from the system"
+ desc = "Punga fruit plants flower at a single point at the terminus of their stems, gradually developing into large, fleshy fruits with a yellow/brown, thick skin. They are common throughout Point Lookout, due to the unique conditions offered by the swamps, and scrub radiation when ingested."
icon_state = "Punga Fruit"
filling_color = "#FF6347"
- distill_reagent = /datum/reagent/consumable/ethanol/pungajuice
-
-/obj/item/reagent_containers/food/snacks/grown/pungafruit/add_juice()
- if(..())
- reagents.add_reagent(/datum/reagent/medicine/charcoal, 1 + round((seed.potency / 20), 1))
- reagents.add_reagent(/datum/reagent/medicine/mutadone, 1 + round((seed.potency / 20), 1))
- bitesize = 1 + round(reagents.total_volume / 3, 1)
+ juice_results = list(/datum/reagent/consumable/ethanol/pungajuice = 0)
diff --git a/code/modules/hydroponics/grown/tato.dm b/code/modules/hydroponics/grown/tato.dm
index e7a5f9de21..14aaf05196 100644
--- a/code/modules/hydroponics/grown/tato.dm
+++ b/code/modules/hydroponics/grown/tato.dm
@@ -6,8 +6,8 @@
plantname = "Tato Plants"
product = /obj/item/reagent_containers/food/snacks/grown/tato
lifespan = 30
- maturation = 10
- production = 1
+ maturation = 7
+ production = 3
yield = 4
growthstages = 4
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
@@ -15,7 +15,7 @@
icon_dead = "tato-dead"
icon_harvest = "tato-harvest"
genes = list(/datum/plant_gene/trait/battery, /datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/consumable/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+ reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/tato
seed = /obj/item/seeds/tato
@@ -25,7 +25,7 @@
filling_color = "#E9967A"
bitesize = 100
foodtype = VEGETABLES
- juice_results = list(/datum/reagent/tato = 0)
+ juice_results = list(/datum/reagent/consumable/tato_juice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/tatovodka
/obj/item/reagent_containers/food/snacks/grown/tato/wedges
diff --git a/code/modules/hydroponics/grown/xander.dm b/code/modules/hydroponics/grown/xander.dm
index 8c5370b5ba..e4cbe8cb3d 100644
--- a/code/modules/hydroponics/grown/xander.dm
+++ b/code/modules/hydroponics/grown/xander.dm
@@ -3,17 +3,19 @@
desc = "These seeds grow into xander roots."
icon_state = "seed-xander"
species = "xander"
- plantname = "xander roots"
+ plantname = "Xander Roots"
product = /obj/item/reagent_containers/food/snacks/grown/xander
lifespan = 25
endurance = 10
yield = 3
growthstages = 4
- production = 2
- maturation = 2
+ production = 4
+ maturation = 4
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
- icon_grow = "potato-grow"
- icon_dead = "potato-dead"
+ icon_grow = "xander-grow"
+ icon_harvest = "xander-harvest"
+ icon_dead = "xander-dead"
+ reagents_add = list(/datum/reagent/medicine/antitoxin = 0.2, /datum/reagent/medicine/salglu_solution = 0.05, /datum/reagent/consumable/nutriment = 0.1)
/obj/item/reagent_containers/food/snacks/grown/xander
seed = /obj/item/seeds/xander
@@ -21,14 +23,5 @@
desc = "Xander roots are large, hardy, turnip-like roots with mild healing properties."
icon_state = "xander"
filling_color = "#FF6347"
- juice_results = list(/datum/reagent/xandertea = 0)
+ juice_results = list(/datum/reagent/consumable/xanderjuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/salgam
-
-/obj/item/reagent_containers/food/snacks/grown/xander/add_juice()
- if(..())
- reagents.add_reagent(/datum/reagent/medicine/antitoxin, 1 + round((seed.potency / 5), 1))
- reagents.add_reagent(/datum/reagent/consumable/xanderjuice, 1 + round((seed.potency/5), 1))
- reagents.add_reagent(/datum/reagent/medicine/salglu, 1 + round((seed.potency / 20), 1))
- bitesize = 1 + round(reagents.total_volume / 3, 1)
-
-/*HRP*/
diff --git a/code/modules/hydroponics/grown/yucca.dm b/code/modules/hydroponics/grown/yucca.dm
index 4a1163c84f..03063fa983 100644
--- a/code/modules/hydroponics/grown/yucca.dm
+++ b/code/modules/hydroponics/grown/yucca.dm
@@ -1,31 +1,31 @@
/obj/item/seeds/yucca
name = "pack of banana yucca seeds"
- desc = "These seeds grow into an agave plant."
+ desc = "These seeds grow into a yucca plant."
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed-yucca"
species = "banna yucca"
- plantname = "banana yucca plant"
+ plantname = "Banana Yucca plant"
product = /obj/item/reagent_containers/food/snacks/grown/yucca
lifespan = 50
endurance = 30
yield = 5
growthstages = 4
- production = 2
- maturation = 1
+ maturation = 5
+ production = 4
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
icon_grow = "yucca-grow"
icon_dead = "yucca-dead"
icon_harvest = "yucca-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
- reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.2, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/consumable/nutriment = 0.2)
+ reagents_add = list( /datum/reagent/consumable/nutriment = 0.2, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.2)
/obj/item/reagent_containers/food/snacks/grown/yucca
seed = /obj/item/seeds/yucca
name = "banana yucca fruit"
- desc = "The fleshy banana banana like fruit, rougly 8 cm long and 6 cm across. It smells tastes similar to a sweet potato."
+ desc = "The fleshy banana like fruit, rougly 8 cm long and 6 cm across. It tastes similar to a sweet potato."
icon_state = "Bannana Yucca"
icon = 'icons/obj/hydroponics/harvest.dmi'
bitesize = 3
- juice_results = list(/datum/reagent/yuccajuice = 0)
+ juice_results = list(/datum/reagent/consumable/yuccajuice = 0)
distill_reagent = /datum/reagent/consumable/yuccajuice
diff --git a/code/modules/jobs/job_types/followers.dm b/code/modules/jobs/job_types/followers.dm
index acb26d864f..ad32042807 100644
--- a/code/modules/jobs/job_types/followers.dm
+++ b/code/modules/jobs/job_types/followers.dm
@@ -363,10 +363,10 @@ Follower Volunteer
/datum/outfit/job/followers/f13followerguard
name = "Followers Guard"
jobtype = /datum/job/followers/f13followerguard
- belt = /obj/item/storage/belt/military/followers
+ belt = /obj/item/storage/belt/military/army/military/followers
id = /obj/item/card/id/silver
uniform = /obj/item/clothing/under/f13/bodyguard
- suit = /obj/item/clothing/suit/armor/vest
+ suit = /obj/item/clothing/suit/armor/vest/big
head = /obj/item/clothing/head/helmet/riot/vaultsec
glasses = /obj/item/clothing/glasses/sunglasses
shoes = /obj/item/clothing/shoes/combat
diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
index 7742cfd2fc..e4bee525e0 100644
--- a/code/modules/jobs/job_types/legion.dm
+++ b/code/modules/jobs/job_types/legion.dm
@@ -587,17 +587,16 @@ commented out pending rework*/
suit_store = /obj/item/gun/ballistic/automatic/smg/smg10mm
backpack_contents = list(
/obj/item/ammo_box/magazine/m10mm_adv/ext = 2,
- /obj/item/melee/onehanded/machete/gladius = 1,
+ /obj/item/melee/onehanded/machete/spatha = 1,
)
-
//EXPLORER
/datum/job/CaesarsLegion/Legionnaire/f13explorer
title = "Legion Explorer"
flag = F13EXPLORER
- total_positions = 2
- spawn_positions = 2
+ total_positions = 3
+ spawn_positions = 3
description = "Scout the area, secure key points, but do not ignore orders or wordlessly die some place. A good explorer helps his unit by taking initiative and helping the commander without needing micro-managment."
supervisors = "the Veteran Decanus and Centurion must be obeyed, and as always, respect must be given to other Decanus. You are not a officer, but you are a specialist."
display_order = JOB_DISPLAY_ORDER_EXPLORER
@@ -734,7 +733,7 @@ commented out pending rework*/
suit_store = /obj/item/gun/ballistic/rifle/repeater/trail
backpack_contents = list(
/obj/item/ammo_box/tube/m44 = 3,
- /obj/item/gun/ballistic/revolver/colt357,
+ /obj/item/gun/ballistic/revolver/colt357 = 1,
/obj/item/ammo_box/a357 = 1,
)
@@ -901,48 +900,39 @@ commented out pending rework*/
////Support Roles ////
//////////////////////
-// SLAVEMASTER Kind off duty, camp defender, making sure slaves and prisoners are in order.
+// Immunes are mostly an off-duty role meant to attend to the camp itself and the slaves or prisoners within.
-/datum/job/CaesarsLegion/Legionnaire/f13slavemaster
- title = "Legion Slavemaster"
- flag = F13SLAVEMASTER
- total_positions = 1
+/datum/job/CaesarsLegion/Legionnaire/f13immune
+ title = "Legion Immune"
+ flag = F13IMMUNE
+ total_positions = 5
spawn_positions = 1
- description = " The Slavemaster is a legionnaire temporarily assigned to keeping slaves and prisoners in check."
+ description = " An Immune is a legionnaire temporarily assigned to keeping the camp in order, according to their tasking on any given week."
supervisors = "the Centurion."
- display_order = JOB_DISPLAY_ORDER_SLAVEMASTER
- outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13slavemaster
+ display_order = JOB_DISPLAY_ORDER_IMMUNE
+ outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13immune
exp_requirements = 300
-/datum/outfit/job/CaesarsLegion/Legionnaire/f13slavemaster
- name = "Slavemaster"
- jobtype = /datum/job/CaesarsLegion/Legionnaire/f13slavemaster
- id = /obj/item/card/id/dogtag/legslavemaster
+/datum/outfit/job/CaesarsLegion/Legionnaire/f13immune
+ name = "Immune"
+ jobtype = /datum/job/CaesarsLegion/Legionnaire/f13immune
+ id = /obj/item/card/id/dogtag/legimmune
mask = /obj/item/clothing/mask/bandana/legion/camp
uniform = /obj/item/clothing/under/f13/legskirt
- suit = /obj/item/clothing/suit/armor/f13/legion/prime/slavemaster
- head = /obj/item/clothing/head/helmet/f13/legion/prime/slavemaster
glasses = /obj/item/clothing/glasses/sunglasses
- shoes = /obj/item/clothing/shoes/roman
- r_pocket = /obj/item/restraints/handcuffs
+ shoes = /obj/item/clothing/shoes/f13/military/leather
l_pocket = /obj/item/flashlight/lantern
suit_store = /obj/item/gun/ballistic/revolver/caravan_shotgun
backpack_contents = list(
/obj/item/storage/bag/money/small/legenlisted = 1,
- /obj/item/melee/onehanded/machete = 1,
- /obj/item/ammo_box/shotgun/bean = 1,
- /obj/item/melee/onehanded/slavewhip = 1,
- /obj/item/razor = 1,
- /obj/item/restraints/legcuffs/bola = 1,
- /obj/item/electropack/shockcollar/explosive = 1,
- /obj/item/warpaint_bowl
+ /obj/item/melee/onehanded/machete/forgedmachete = 1,
+ /obj/item/reagent_containers/pill/patch/healingpowder = 2
)
-/datum/outfit/job/CaesarsLegion/Legionnaire/f13slavemaster/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/CaesarsLegion/Legionnaire/f13immune/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(visualsOnly)
return
- ADD_TRAIT(H, TRAIT_BIG_LEAGUES, src)
ADD_TRAIT(H, TRAIT_MARS_TEACH, src)
// FORGE MASTER
@@ -950,8 +940,8 @@ commented out pending rework*/
/datum/job/CaesarsLegion/Legionnaire/f13campfollower // Chainsaw, Extra materials, Blueprints
title = "Legion Forgemaster"
flag = F13CAMPFOLLOWER
- total_positions = 1
- spawn_positions = 1
+ total_positions = 2
+ spawn_positions = 2
description = "The Forgemaster makes weapons of all sorts and upgrades them, keeping order in the Forge and makes sure the camp is defended."
supervisors = "the Centurion."
display_order = JOB_DISPLAY_ORDER_CAMPFOLLOWER
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index 1c952723f6..1e973a3bd0 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -10,7 +10,7 @@ Money Commanding Officer (LT and CAP) - "small" money bag
Officers and Rangers - /obj/item/storage/bag/money/small/ncrofficers
Rest - /obj/item/storage/bag/money/small/ncrenlisted
Sidearm Officers & a few specialists - 9mm pistol
-Weapons Service Rifle, Rockwell, 9mm pistol, all good.
+Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
Don't use Greaseguns, Lever shotguns, Police shotguns, Berettas, Hunting knives
*/
@@ -454,6 +454,7 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
/datum/outfit/loadout/vrclassic, // AMR, Sequoia
/datum/outfit/loadout/vrlite, // Brush Gun, Sequoia
/datum/outfit/loadout/vrcqc, // 2 x .45 Long colt revolvers
+ /datum/outfit/loadout/vrshotgunner //Riot shotty, Sequoia
)
/datum/outfit/job/ncr/f13vetranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -504,6 +505,16 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
/obj/item/ammo_box/c4570 = 1,
)
+/datum/outfit/loadout/vrshotgunner
+ name = "Veteran Ranger Shotgunner"
+ suit_store = /obj/item/gun/ballistic/automatic/shotgun/riot
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/ammo_box/shotgun/slug = 1,
+ /obj/item/gun/ballistic/revolver/sequoia = 1,
+ /obj/item/ammo_box/c4570 = 1,
+ )
+
/datum/outfit/loadout/vrcqc
name = "Gunslinger"
mask = /obj/item/clothing/mask/cigarette/cigar/havana
@@ -520,8 +531,8 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
/datum/job/ncr/f13ranger
title = "NCR Ranger"
flag = F13RANGER
- total_positions = 2
- spawn_positions = 2
+ total_positions = 3
+ spawn_positions = 3
description = "As an NCR Ranger, you are the premier special forces unit of the NCR. You are the forward observations and support the Army in it's campaigns, as well as continuing the tradition of stopping slavery in it's tracks."
supervisors = "Veteran Ranger"
selection_color = "#fff5cc"
@@ -690,8 +701,8 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
/datum/job/ncr/f13combatengineer
title = "NCR Combat Engineer"
flag = F13COMBATENGINEER
- total_positions = 1
- spawn_positions = 1
+ total_positions = 2
+ spawn_positions = 2
description = "You are a senior enlisted trooper with an engineering skill set. You work closely with your squad, taking orders from the officers. You have the authority to command troopers if there are no non-commissioned officers present."
supervisors = "Corporals and Above"
access = list(ACCESS_NCR, ACCESS_NCR_ARMORY)
@@ -701,7 +712,7 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
loadout_options = list( // ALL: Trench tool, Limited blueprints
/datum/outfit/loadout/combatengineerbuilder, // M1/n carbine, X4 explosive, Extra materials
- /datum/outfit/loadout/combatengineertrapper, // Rockwell SMG, Minelaying, Explosive Crafting
+ /datum/outfit/loadout/combatengineertrapper, // Grease Gun, Minelaying, Explosive Crafting
/datum/outfit/loadout/combatengineerflamethrower, // Flamer, M1/n carbine
)
@@ -764,9 +775,9 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
name = "Minelayer"
head = /obj/item/clothing/head/f13/ncr
belt = /obj/item/storage/belt/military/assault/ncr/engineer
- suit_store = /obj/item/gun/ballistic/automatic/smg/rockwell
+ suit_store = /obj/item/gun/ballistic/automatic/smg/greasegun
backpack_contents = list(
- /obj/item/ammo_box/magazine/uzim9mm/rockwell = 2,
+ /obj/item/ammo_box/magazine/greasegun = 2,
/obj/item/book/granter/crafting_recipe/blueprint/trapper = 1,
/obj/item/book/granter/trait/explosives = 1
)
@@ -805,7 +816,7 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
accessory = /obj/item/clothing/accessory/armband/black
glasses = /obj/item/clothing/glasses/sunglasses/big
head = /obj/item/clothing/head/f13/ncr/steelpot_mp
- suit = /obj/item/clothing/suit/armor/f13/ncrarmor
+ suit = /obj/item/clothing/suit/armor/f13/ncrarmor/mantle/reinforced
gloves = /obj/item/clothing/gloves/f13/leather/fingerless
backpack = /obj/item/storage/backpack/satchel/trekker
suit_store = /obj/item/melee/classic_baton/militarypolice
@@ -828,8 +839,8 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
/datum/job/ncr/f13combatmedic
title = "NCR Combat Medic"
flag = F13COMBATMEDIC
- total_positions = 1
- spawn_positions = 1
+ total_positions = 2
+ spawn_positions = 2
description = "You are a senior enlisted with a medical skill set. You work closely with your squad, taking orders from your officers. You have the authority to command troopers if there are no non-commissioned officers present."
supervisors = "Corporals and Above"
selection_color = "#fff5cc"
@@ -1104,7 +1115,7 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
H.mind.teach_crafting_recipe(/datum/crafting_recipe/scoutcarbine)
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
-/datum/outfit/job/ncr/f13logisticsofficer // Rockwell, 9mm sidearm, Survival knife, C-4 bomb, Extra materials, Full blueprints
+/datum/outfit/job/ncr/f13logisticsofficer // Grease Gun, 9mm sidearm, Survival knife, C-4 bomb, Extra materials, Full blueprints
name = "NCR Logistics Officer"
jobtype = /datum/job/ncr/f13logisticsofficer
id = /obj/item/card/id/dogtag/ncrlieutenant
@@ -1116,9 +1127,9 @@ Weapons Service Rifle, Rockwell, 9mm pistol, all good.
glasses = /obj/item/clothing/glasses/welding
belt = /obj/item/storage/belt/military/assault/ncr/engineer
gloves = /obj/item/clothing/gloves/color/yellow
- suit_store = /obj/item/gun/ballistic/automatic/smg/rockwell
+ suit_store = /obj/item/gun/ballistic/automatic/smg/greasegun
backpack_contents = list(
- /obj/item/ammo_box/magazine/uzim9mm/rockwell = 2,
+ /obj/item/ammo_box/magazine/greasegun = 2,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
/obj/item/ammo_box/magazine/m9mm = 2,
/obj/item/grenade/plastic/c4 = 1,
diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm
index 6b9ce2660f..a1e621c67f 100644
--- a/code/modules/jobs/job_types/oasis.dm
+++ b/code/modules/jobs/job_types/oasis.dm
@@ -66,14 +66,12 @@ Mayor
satchel = /obj/item/storage/backpack/satchel/explorer
l_pocket = /obj/item/storage/bag/money/small/settler
r_pocket = /obj/item/flashlight/seclite
- belt = /obj/item/gun/ballistic/automatic/wt550
shoes = /obj/item/clothing/shoes/f13/tan
uniform = /obj/item/clothing/under/f13/gentlesuit
head = /obj/item/clothing/head/f13/town/big
backpack_contents = list(
/obj/item/storage/box/citizenship_permits = 1, \
/obj/item/pen/fountain/captain = 1,
- /obj/item/ammo_box/magazine/m473/small = 2,
)
@@ -385,12 +383,12 @@ Mayor
suit = /obj/item/clothing/suit/armor/bulletproof
head = /obj/item/clothing/head/helmet/alt
neck = /obj/item/storage/belt/holster/legholster
- l_hand = /obj/item/gun/ballistic/automatic/marksman/policerifle
+ l_hand = /obj/item/gun/ballistic/automatic/assault_carbine/policerifle
shoes = /obj/item/clothing/shoes/jackboots
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle = 2,
- /obj/item/gun/ballistic/automatic/pistol/mk23=1,
/obj/item/ammo_box/magazine/m45exp=2,
+ /obj/item/gun/ballistic/automatic/pistol/mk23=1,
+ /obj/item/ammo_box/magazine/m5mm=1,
/obj/item/flashlight/seclite = 1,
)
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 011da3c6ef..a3f38b47ec 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -48,21 +48,15 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
))
GLOBAL_LIST_INIT(command_positions, list(
- "Head Scribe",
"Head Paladin",
"Head Knight",
"NCR Captain",
- "NCR Lieutenant",
"NCR Veteran Ranger",
"Legion Centurion",
- "Legion Veteran Decanus",
- "Mayor",
"Sheriff",
-
- "Followers Administrator",
))
GLOBAL_LIST_INIT(silicon_whitelist_positions, list(
@@ -170,7 +164,7 @@ GLOBAL_LIST_INIT(legion_positions, list(
"Prime Legionnaire",
"Recruit Legionnaire",
"Legion Forgemaster",
- "Legion Slavemaster",
+ "Legion Immune",
"Legion Auxilia",
"Legion Slave",
"Legion Venator",
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
index a6a270ec2a..59823bb49a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
@@ -114,11 +114,13 @@
/datum/sprite_accessory/underwear/socks/stockings_orange
name = "Stockings - Orange"
icon_state = "stockings_orange"
+*/
/datum/sprite_accessory/underwear/socks/stockings_programmer
name = "Stockings - Programmer"
icon_state = "stockings_lpink"
+/*
/datum/sprite_accessory/underwear/socks/stockings_purple
name = "Stockings - Purple"
icon_state = "stockings_purple"
@@ -156,6 +158,8 @@
name = "Thigh-high - Freedom"
icon_state = "assblastusa_thigh"
+*/
+
/datum/sprite_accessory/underwear/socks/rainbow_thigh
name = "Thigh-high - Rainbow"
icon_state = "rainbow_thigh"
@@ -172,7 +176,7 @@
name = "Thigh-high - Striped"
icon_state = "striped_thigh"
has_color = TRUE
-*/
+
/datum/sprite_accessory/underwear/socks/thin_thigh
name = "Thigh-high - Thin"
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index e7ad67d240..b943ebd1f6 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -19,7 +19,6 @@
/// How much brute damage they do to simple animals
var/meleeSlashSAPower = 35
- var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
var/has_fine_manipulation = 0
var/move_delay_add = 0 // movement delay to add
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index 65e59d0e29..436c0732ba 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -29,7 +29,7 @@
var/loss = HUNGER_FACTOR/10
if(m_intent == MOVE_INTENT_RUN)
loss *= 2
- adjust_nutrition(loss)
+ adjust_nutrition(-loss)
/mob/living/carbon/can_move_under_living(mob/living/other)
. = ..()
diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm
index 51a1e9000e..3bd3c1510a 100644
--- a/code/modules/projectiles/ammunition/caseless/arrow.dm
+++ b/code/modules/projectiles/ammunition/caseless/arrow.dm
@@ -50,7 +50,7 @@
/obj/item/ammo_casing/caseless/arrow/bone
name = "bone arrow"
- desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through a goliath plate."
+ desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through deathclaw hide."
icon_state = "bonearrow"
projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 462af0b365..20cb10a665 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -16,7 +16,7 @@
weapon_weight = WEAPON_HEAVY
slot_flags = 0
force = 15
- burst_size = 2
+ burst_size = 1
burst_shot_delay = 3
var/automatic_burst_overlay = TRUE
var/semi_auto = FALSE
@@ -24,6 +24,7 @@
var/auto_eject_sound = null
var/alarmed = 0
var/select = 1
+ var/is_automatic = FALSE
can_suppress = FALSE
equipsound = 'sound/f13weapons/equipsounds/riflequip.ogg'
@@ -85,7 +86,10 @@
/obj/item/gun/ballistic/automatic/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/toggle_firemode))
- burst_select()
+ if(is_automatic == FALSE)
+ burst_select()
+ if(is_automatic == TRUE)
+ auto_select()
else
return ..()
@@ -108,6 +112,25 @@
var/datum/action/A = X
A.UpdateButtonIcon()
+/obj/item/gun/ballistic/automatic/proc/auto_select()
+ var/mob/living/carbon/human/user = usr
+ if(semi_auto)
+ to_chat(user, "This weapon is semi-automatic only.")
+ return
+ else
+ select = !select
+ if(!select)
+ disable_auto()
+ to_chat(user, "You switch to semi-automatic.")
+ else
+ enable_auto()
+ to_chat(user, "You switch to automatic fire.")
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+ update_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
/obj/item/gun/ballistic/automatic/proc/enable_burst()
burst_size = initial(burst_size)
if(auto_sear)
@@ -120,6 +143,12 @@
/obj/item/gun/ballistic/automatic/proc/disable_burst()
burst_size = initial(burst_size)
+/obj/item/gun/ballistic/automatic/proc/enable_auto()
+ automatic = 1
+
+/obj/item/gun/ballistic/automatic/proc/disable_auto()
+ automatic = 0
+
/obj/item/gun/ballistic/automatic/can_shoot()
return get_ammo()
@@ -178,6 +207,9 @@
item_state = "rockwell"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
init_mag_type = /obj/item/ammo_box/magazine/uzim9mm/rockwell
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
burst_shot_delay = 2.75
recoil = 0.1
spread = 12
@@ -195,7 +227,11 @@
w_class = WEIGHT_CLASS_BULKY
mag_type = /obj/item/ammo_box/magazine/m22smg
can_unsuppress = FALSE
- burst_shot_delay = 1.5 //rapid fire
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 1.5
+ spread = 18
+ burst_shot_delay = 1.5
extra_damage = 16
suppressed = 1
actions_types = null
@@ -212,6 +248,10 @@
spread = 8
extra_damage = 19
burst_shot_delay = 2.75
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.5
+ spread = 14
can_attachments = TRUE
suppressor_state = "uzi_suppressor"
suppressor_x_offset = 26
@@ -219,13 +259,13 @@
actions_types = list(/datum/action/item_action/toggle_firemode)
fire_sound = 'sound/f13weapons/greasegun.ogg'
-/obj/item/gun/ballistic/automatic/smg/greasegun/burst_select()
+/obj/item/gun/ballistic/automatic/smg/greasegun/auto_select()
var/mob/living/carbon/human/user = usr
switch(select)
if(0)
select += 1
- burst_size = 2
- spread = 8
+ automatic = 1
+ spread = 14
fire_delay = 3.25
recoil = 0.1
weapon_weight = WEAPON_HEAVY
@@ -233,7 +273,7 @@
enable_burst()
if(1)
select = 0
- burst_size = 1
+ automatic = 0
fire_delay = 3.25
spread = 2
weapon_weight = WEAPON_MEDIUM
@@ -246,16 +286,17 @@
name = "beat up M3A1 Grease Gun"
desc = "What was once an inexpensive, but reliable submachine gun is now an inexpensive piece of shit. It's impressive this thing still fires at all."
can_attachments = FALSE
+ spread = 16.5
recoil = 0.3
extra_damage = 17
-/obj/item/gun/ballistic/automatic/smg/greasegun/worn/burst_select()
+/obj/item/gun/ballistic/automatic/smg/greasegun/worn/auto_select()
var/mob/living/carbon/human/user = usr
switch(select)
if(0)
select += 1
- burst_size = 2
- spread = 12.5
+ automatic = 1
+ spread = 16.5
fire_delay = 3.75
recoil = 0.3
weapon_weight = WEAPON_HEAVY
@@ -263,7 +304,7 @@
enable_burst()
if(1)
select = 0
- burst_size = 1
+ automatic = 0
fire_delay = 3.75
spread = 2
weapon_weight = WEAPON_HEAVY
@@ -282,6 +323,10 @@
icon_prefix = "smg10mm"
mag_type = /obj/item/ammo_box/magazine/m10mm_adv
init_mag_type = /obj/item/ammo_box/magazine/m10mm_adv/ext
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
+ spread = 12
extra_damage = 20
extra_penetration = 0.1
recoil = 0.05
@@ -302,13 +347,13 @@
extra_damage = 18
spread = 10
-/obj/item/gun/ballistic/automatic/smg/smg10mm/burst_select()
+/obj/item/gun/ballistic/automatic/smg/smg10mm/auto_select()
var/mob/living/carbon/human/user = usr
switch(select)
if(0)
select += 1
- burst_size = 2
- spread = 9
+ automatic = 1
+ spread = 12
fire_delay = 3.25
recoil = 0.1
weapon_weight = WEAPON_HEAVY
@@ -316,7 +361,7 @@
enable_burst()
if(1)
select = 0
- burst_size = 1
+ automatic = 0
fire_delay = 3.25
spread = 2
weapon_weight = WEAPON_MEDIUM
@@ -334,6 +379,10 @@
mag_type = /obj/item/ammo_box/magazine/uzim9mm
fire_delay = 3
burst_shot_delay = 2.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2
+ spread = 16
extra_damage = 18
can_suppress = TRUE
can_attachments = TRUE
@@ -343,13 +392,13 @@
suppressor_y_offset = 16
actions_types = list(/datum/action/item_action/toggle_firemode)
-/obj/item/gun/ballistic/automatic/smg/mini_uzi/burst_select()
+/obj/item/gun/ballistic/automatic/smg/mini_uzi/auto_select()
var/mob/living/carbon/human/user = usr
switch(select)
if(0)
select += 1
- burst_size = 2
- spread = 11
+ automatic = 1
+ spread = 16
fire_delay = 3
recoil = 0.1
weapon_weight = WEAPON_HEAVY
@@ -357,7 +406,7 @@
enable_burst()
if(1)
select = 0
- burst_size = 1
+ automatic = 0
fire_delay = 3
spread = 3
weapon_weight = WEAPON_MEDIUM
@@ -374,6 +423,10 @@
icon_state = "cg45"
item_state = "cg45"
mag_type = /obj/item/ammo_box/magazine/cg45
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
+ spread = 12
fire_delay = 3.5
extra_damage = 20
spread = 8
@@ -393,7 +446,9 @@
mag_type = /obj/item/ammo_box/magazine/tommygunm45
init_mag_type = /obj/item/ammo_box/magazine/tommygunm45/stick
fire_sound = 'sound/weapons/gunshot_smg.ogg'
- burst_size = 3
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
burst_shot_delay = 2.75
fire_delay = 3.75
extra_damage = 25
@@ -405,11 +460,9 @@
name = "Storm Drum"
desc = "A recovered ancient Thompson from an armory far up North. Commonly used by raiders of the White Legs tribe."
mag_type = /obj/item/ammo_box/magazine/tommygunm45/stick
- semi_auto = TRUE
fire_delay = 3.75
extra_damage = 23
- burst_size = 2
- spread = 10
+ spread = 19
//P90 Keywords: 10mm, Automatic, 50 rounds. Special modifiers: damage +1
/obj/item/gun/ballistic/automatic/smg/p90
@@ -421,9 +474,12 @@
mag_type = /obj/item/ammo_box/magazine/m10mm_p90
extra_damage = 22
extra_penetration = 0.15
- burst_size = 3
+ burst_size = 1
fire_delay = 3
- spread = 7
+ spread = 14
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2
burst_shot_delay = 2.5
extra_damage = 1
recoil = 0.25
@@ -436,8 +492,8 @@
/obj/item/gun/ballistic/automatic/smg/p90/worn
name = "Worn FN P90c"
desc = "A FN P90 manufactured by Fabrique Nationale. This one is beat to hell but still works."
- fire_delay = 4
- burst_size = 2
+ autofire_shot_delay = 2.25
+ spread = 16
extra_damage = 20
@@ -448,8 +504,11 @@
icon_state = "mp5"
item_state = "fnfal"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
- spread = 8
+ spread = 10
fire_delay = 3.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2
burst_shot_delay = 2
extra_damage = 18
suppressed = 1
@@ -469,8 +528,10 @@
w_class = WEIGHT_CLASS_BULKY
mag_type = /obj/item/ammo_box/magazine/pps9mm
spread = 20
- burst_size = 3
fire_delay = 6
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
burst_shot_delay = 1.5
extra_damage = 18
extra_penetration = 0.05
@@ -578,9 +639,9 @@
weapon_weight = WEAPON_MEDIUM
spread = 0 //low-recoil + forward grip
fire_delay = 3
-
-
-
+
+
+
////////////////////
//SEMI-AUTO RIFLES//
@@ -645,6 +706,23 @@
scope_x_offset = 6
scope_y_offset = 14
+//'Verminkiller' Keywords: 5.56, 10/20/30 round magazine, Suppressed, Scoped, 25 damage
+//Basically an obtainable ratslayer
+/obj/item/gun/ballistic/automatic/varmint/verminkiller
+ name = "verminkiller rifle"
+ desc = "Legends are told of the \"Ratslayer\", a custom-made souped-up varmint rifle with a sick paintjob. This is a pale imitation, made of chopped-up bits of other guns."
+ icon_state = "verminrifle"
+ item_state = "ratslayer"
+ extra_damage = 25
+ suppressed = 1
+ zoomable = TRUE
+ zoom_amt = 10
+ zoom_out_amt = 13
+ can_scope = FALSE
+ can_unsuppress = FALSE
+ suppressor_state = "none"
+ fire_sound = 'sound/weapons/Gunshot_large_silenced.ogg'
+
//Ratslayer Keywords: UNIQUE, 5.56, 10/20/30 round magazine, Suppressed, Scoped, Extra damage +3
/obj/item/gun/ballistic/automatic/varmint/ratslayer
name = "Ratslayer"
@@ -669,7 +747,7 @@
icon_prefix = "servicerifle"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
slowdown = 0.45
- fire_delay = 3.5
+ fire_delay = 3
burst_size = 1
spread = 1
extra_damage = 25
@@ -768,7 +846,24 @@
suppressor_x_offset = 31
suppressor_y_offset = 15
fire_sound = 'sound/f13weapons/marksman_rifle.ogg'
-
+
+/obj/item/gun/ballistic/automatic/marksman/policerifle
+ name = "Police Rifle"
+ desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Oasis Police Department. Held together by duct tape and prayers, it somehow still shoots. This one has been re-chambered to 5.56"
+ icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
+ righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
+ icon_prefix = "assault_carbine"
+ icon_state = "rifle-police"
+ item_state = "assault_carbine"
+ init_mag_type = /obj/item/ammo_box/magazine/m556/rifle
+ extra_damage = 25
+ extra_penetration = 0.1
+ spread = 1.1
+ fire_delay = 4.5
+ can_suppress = FALSE
+ can_scope = TRUE
+ zoomable = FALSE
//Colt Rangemaster Keywords: 7.62mm, Semi-auto, 10/20 round magazine, 35dmg
/obj/item/gun/ballistic/automatic/rangemaster
@@ -906,7 +1001,7 @@
fire_sound = 'sound/f13weapons/hunting_rifle.ogg'
-//DKS 501 sniper rifle Keywords: .308, Semi-auto, 7 round magazine, Scoped, Extra speed +500, Fire delay +1, 45dmg
+//DKS 501 sniper rifle Keywords: .308, Semi-auto, 7 round magazine, Scoped, Extra speed +500, Fire delay +1, 45dmg
/obj/item/gun/ballistic/automatic/marksman/sniper
name = "sniper rifle"
desc = "A DKS 501, chambered in .308 Winchester. With a light polymer body, it's suited for long treks through the desert."
@@ -948,6 +1043,10 @@
icon_prefix = "r82"
extra_damage = 28
fire_delay = 2.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
+ spread = 10
can_suppress = TRUE
suppressor_state = "rifle_suppressor"
suppressor_x_offset = 27
@@ -962,9 +1061,12 @@
item_state = "fnfal"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
fire_delay = 4
- spread = 8
+ spread = 10
extra_damage = 23
recoil = 0.1
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
can_attachments = TRUE
can_bayonet = FALSE
bayonet_state = "rifles"
@@ -989,6 +1091,9 @@
spread = 9
fire_delay = 3.5
burst_shot_delay = 2
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
recoil = 0.6
can_suppress = FALSE
can_unsuppress = FALSE
@@ -1035,6 +1140,9 @@
spread = 10
extra_damage = 23
extra_penetration = 0.05
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
recoil = 0.1
can_suppress = TRUE
suppressor_state = "rifle_suppressor"
@@ -1063,11 +1171,13 @@
item_state = "sniper"
slot_flags = SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/m556/rifle
- burst_size = 3
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2
burst_shot_delay = 1.5
extra_damage = 25
fire_delay = 3
- spread = 4
+ spread = 8
recoil = 0.1
can_attachments = FALSE
zoomable = TRUE
@@ -1078,7 +1188,7 @@
fire_sound = 'sound/f13weapons/bozar_fire.ogg'
-//Assault Carbine Keywords: 5mm, Automatic, 30 round magazine, Flashlight, 19dmg/0.15AP
+//Assault Carbine Keywords: 5mm, Automatic, 30 round magazine, Flashlight, 20dmg/0.25AP
/obj/item/gun/ballistic/automatic/assault_carbine
name = "assault carbine"
desc = "The U.S. army carbine version of the R91, made by Colt and issued to special forces."
@@ -1089,9 +1199,12 @@
mag_type = /obj/item/ammo_box/magazine/m5mm
fire_delay = 3
burst_shot_delay = 2.0
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.5
extra_damage = 20
extra_penetration = 0.25
- spread = 6 //high-velocity
+ spread = 10 //high-velocity
can_attachments = TRUE
can_scope = TRUE
scope_state = "scope_short"
@@ -1107,6 +1220,21 @@
flight_y_offset = 21
actions_types = list(/datum/action/item_action/toggle_firemode)
fire_sound = 'sound/f13weapons/assault_carbine.ogg'
+
+ //Police rifle Keywords: OASIS, 5mm, Semi-auto, 30 round magazine
+/obj/item/gun/ballistic/automatic/assault_carbine/policerifle
+ name = "Police Rifle"
+ desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Oasis Police Department. Held together by duct tape and prayers, it somehow still shoots."
+ icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
+ righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
+ icon_state = "rifle-police"
+ extra_damage = 22
+ spread = 1.1
+ fire_delay = 3.5
+ can_scope = TRUE
+ can_automatic = FALSE
+ semi_auto = TRUE
/obj/item/gun/ballistic/automatic/assault_carbine/worn
name = "worn assault carbine"
@@ -1115,7 +1243,7 @@
fire_delay = 3.5
burst_shot_delay = 2.5
extra_penetration = 0.15
- spread = 10
+ spread = 14
extra_damage = 18
//FN-FAL Keywords: 7.62mm, Automatic, 10/20 round magazine
@@ -1127,6 +1255,9 @@
force = 20
extra_damage = 30
fire_delay = 3.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
mag_type = /obj/item/ammo_box/magazine/m762
spread = 12
recoil = 0.25
@@ -1143,6 +1274,9 @@
mag_type = /obj/item/ammo_box/magazine/m473
extra_damage = 23
fire_delay = 2.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.25
burst_shot_delay = 1.5
extra_penetration = 0.1
extra_damage = 3
@@ -1171,35 +1305,16 @@
slowdown = 1
mag_type = /obj/item/ammo_box/magazine/lmg
extra_damage = 23
- burst_size = 1
fire_delay = 6
burst_shot_delay = 2.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3
+ spread = 8
can_attachments = FALSE
- actions_types = list(/datum/action/item_action/toggle_firemode)
+ actions_types = null
fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'
-/obj/item/gun/ballistic/automatic/r84/burst_select()
- var/mob/living/carbon/human/user = usr
- switch(select)
- if(0)
- select += 1
- burst_size = 2
- spread = 8
- extra_damage = 23
- recoil = 0.25
- to_chat(user, "You switch to burst fire.")
- if(1)
- select = 0
- burst_size = 5
- spread = 14
- extra_damage = 23
- recoil = 0.75
- to_chat(user, "You switch to full auto.")
- playsound(user, 'sound/weapons/empty.ogg', 100, 1)
- update_icon()
- return
-
-
//LSW squad support weapon Keywords: 5.56mm, Automatic, 20 (10-50) round magazine, Scoped, Damage decrease (bullethose)
/obj/item/gun/ballistic/automatic/lsw
name = "LSW (Light Support Weapon)"
@@ -1255,15 +1370,17 @@
slot_flags = 0
slowdown = 1.25
mag_type = /obj/item/ammo_box/magazine/mm762
- burst_size = 1
burst_shot_delay = 1.5
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 3.25
fire_delay = 4
extra_damage = 28
spread = 8
can_attachments = FALSE
var/cover_open = FALSE
var/require_twohands = FALSE
- actions_types = list(/datum/action/item_action/toggle_firemode)
+ actions_types = null
fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'
/obj/item/gun/ballistic/automatic/m1919/update_icon()
@@ -1313,27 +1430,6 @@
return
..()
-/obj/item/gun/ballistic/automatic/m1919/burst_select()
- var/mob/living/carbon/human/user = usr
- switch(select)
- if(0)
- select += 1
- burst_size = 2
- spread = 8
- extra_damage = 28
- recoil = 0.25
- to_chat(user, "You switch to burst fire.")
- if(1)
- select = 0
- burst_size = 4
- spread = 18
- extra_damage = 28
- recoil = 1
- to_chat(user, "You switch to full auto.")
- playsound(user, 'sound/weapons/empty.ogg', 100, 1)
- update_icon()
- return
-
////////
@@ -1366,9 +1462,12 @@
mag_type = /obj/item/ammo_box/magazine/m556/rifle
fire_delay = 2
burst_shot_delay = 2
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.5
spawnwithmagazine = TRUE
extra_damage = 25
- spread = 4
+ spread = 8
can_attachments = TRUE
zoomable = TRUE
zoom_amt = 10
diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm
index 820bafe91d..2ebd8401e3 100644
--- a/code/modules/projectiles/guns/ballistic/minigun.dm
+++ b/code/modules/projectiles/guns/ballistic/minigun.dm
@@ -94,11 +94,13 @@
slowdown = 2
slot_flags = null
w_class = WEIGHT_CLASS_HUGE
- burst_size = 5
+ burst_size = 1
+ automatic = 1
+ autofire_shot_delay = 2.15
burst_shot_delay = 1
fire_delay = 1
ranged_attack_speed = CLICK_CD_RAPID
- spread = 10
+ spread = 12
weapon_weight = WEAPON_HEAVY
extra_penetration = 0
extra_damage = 10
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 16f819df6b..b8fc737a21 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -115,7 +115,6 @@
item_state = "cowboyrepeater"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube357
extra_damage = 35
- fire_delay = 4.5
fire_sound = 'sound/f13weapons/cowboyrepeaterfire.ogg'
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 48202255f2..4ecf3d7ab0 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -450,7 +450,10 @@
icon_state = "lasercw"
item_state = "rcw"
fire_delay = 3
- burst_size = 2
+ burst_size = 1
+ automatic = 1
+ autofire_shot_delay = 2
+ spread = 14
ammo_type = list(/obj/item/ammo_casing/energy/laser/rcw/hitscan)
cell_type = /obj/item/stock_parts/cell/ammo/ecp
equipsound = 'sound/f13weapons/equipsounds/RCWequip.ogg'
@@ -596,9 +599,11 @@
slot_flags = null
w_class = WEIGHT_CLASS_HUGE
custom_materials = null
- burst_size = 5
+ burst_size = 1
burst_shot_delay = 1
- ranged_attack_speed = CLICK_CD_RAPID
+ automatic = 1
+ autofire_shot_delay = 2.5
+ spread = 8
fire_delay = 1
weapon_weight = WEAPON_HEAVY
fire_sound = 'sound/weapons/laser.ogg'
diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm
index 570e6d0dd3..8f83aadd3d 100644
--- a/code/modules/projectiles/guns/energy/plasmaf13.dm
+++ b/code/modules/projectiles/guns/energy/plasmaf13.dm
@@ -11,7 +11,7 @@
icon_state = "plasma-pistol"
desc = "A pistol-sized miniaturized plasma caster built by REPCONN. It fires a bolt of superhot ionized gas."
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_LIGHT
+ weapon_weight = WEAPON_MEDIUM
slot_flags = ITEM_SLOT_BELT
ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol)
cell_type = /obj/item/stock_parts/cell/ammo/ec
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 8e5104f8d2..b2f45aee95 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -147,6 +147,9 @@
var/impact_effect_type //what type of impact effect to show when hitting something
var/log_override = FALSE //is this type spammed enough to not log? (KAs)
+ var/supereffective_damage = 0
+ var/list/supereffective_faction //Any mob with a faction that exists in this list will take bonus damage
+
var/temporary_unstoppable_movement = FALSE
///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
@@ -359,6 +362,12 @@
#define FORCE_QDEL 3 //Force deletion.
/obj/item/projectile/proc/process_hit(turf/T, atom/target, qdel_self, hit_something = FALSE) //probably needs to be reworked entirely when pixel movement is done.
+ if(isliving(target) && LAZYLEN(supereffective_faction))
+ var/mob/living/L = target
+ for(var/F in L.faction)
+ if(F in supereffective_faction)
+ damage += supereffective_damage
+ break
if(QDELETED(src) || !T || !target) //We're done, nothing's left.
if((qdel_self == FORCE_QDEL) || ((qdel_self == QDEL_SELF) && !temporary_unstoppable_movement && !CHECK_BITFIELD(movement_type, UNSTOPPABLE)))
qdel(src)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 3ee0f975a6..dd08c5832a 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -568,6 +568,7 @@
damage = 25
wound_bonus = 10
bare_wound_bonus = 20
+ armour_penetration = 0
tracer_type = /obj/effect/projectile/tracer/heavy_laser
muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
impact_type = /obj/effect/projectile/impact/heavy_laser
diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm
index 648520e341..d9251750c1 100644
--- a/code/modules/projectiles/projectile/reusable/arrow.dm
+++ b/code/modules/projectiles/projectile/reusable/arrow.dm
@@ -13,17 +13,20 @@
damage = 0.5
ammo_type = /obj/item/ammo_casing/caseless/arrow/ash
-/obj/item/projectile/bullet/reusable/arrow/bone //AP for ashwalkers
+/obj/item/projectile/bullet/reusable/arrow/bone //extra mob damage
name = "bone arrow"
desc = "Arrow made of bone and sinew."
- damage = 30
- armour_penetration = 0.35
+ damage = 20
+ armour_penetration = 0.10
+ supereffective_damage = 40
+ supereffective_faction = list("hostile", "ant", "supermutant", "deathclaw", "cazador", "raider", "china", "gecko", "wastebot")
ammo_type = /obj/item/ammo_casing/caseless/arrow/bone
/obj/item/projectile/bullet/reusable/arrow/bronze //Just some AP shots
name = "bronze arrow"
desc = "Bronze tipped arrow."
- armour_penetration = 0.2
+ damage = 30
+ armour_penetration = 0.35
ammo_type = /obj/item/ammo_casing/caseless/arrow/bronze
//FO13 ARROWS
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 28f0b2366a..7f56d2b38f 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -83,6 +83,15 @@
updateUsrDialog()
update_icon()
return
+ if(beaker)
+ if(istype(I, /obj/item/reagent_containers/dropper))
+ var/obj/item/reagent_containers/dropper/D = I
+ D.afterattack(beaker, user, 1)
+ return
+ if(istype(I, /obj/item/reagent_containers/syringe))
+ var/obj/item/reagent_containers/syringe/S = I
+ S.afterattack(beaker, user, 1)
+ return
return ..()
/obj/machinery/chem_heater/on_deconstruction()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index aa7ceb6973..3dffddd325 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -11,6 +11,7 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
circuit = /obj/item/circuitboard/machine/chem_master
+
var/obj/item/reagent_containers/beaker = null
var/obj/item/storage/pill_bottle/bottle = null
var/mode = 1
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 14c3e40b47..e594f40bf1 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -382,18 +382,98 @@
/datum/reagent/consumable/brocjuice
name = "Broc Flower Juice"
- description = "The juice of a ground-up broc flower."
+ description = "The juice of a ground-up broc flower. Heals mild hypoxia."
nutriment_factor = 1 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "flowers"
+/datum/reagent/consumable/brocjuice/on_mob_life(mob/living/carbon/M)
+ M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, 0)
+ ..()
+
/datum/reagent/consumable/xanderjuice
name = "Xander Root Juice"
- description = "Ground up xander root, mashed into juicy pulp."
+ description = "Ground up xander root, mashed into juicy pulp. Stimulates blood production."
nutriment_factor = 1 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "dirt"
+/datum/reagent/consumable/xanderjuice/on_mob_life(mob/living/carbon/M)
+ if(M.blood_volume < BLOOD_VOLUME_NORMAL)
+ M.blood_volume = min(BLOOD_VOLUME_NORMAL, M.blood_volume + 1)
+ ..()
+
+/datum/reagent/consumable/agavejuice
+ name = "Agave Leaf Juice"
+ description = "Ground up agave leaf, mashed into juicy pulp. Heals minor burns."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#BAE3B4"
+ taste_description = "plants"
+
+/datum/reagent/consumable/agavejuice/on_mob_life(mob/living/carbon/M)
+ M.adjustFireLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
+ ..()
+
+/datum/reagent/consumable/ferajuice
+ name = "Barrel Fruit Juice"
+ description = "Squeezed barrelfruit juice. Heals damage caused by poisons and venoms."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#E8E67E"
+ taste_description = "bitter"
+
+/datum/reagent/consumable/ferajuice/on_mob_life(mob/living/carbon/M)
+ if(M.health > 20)
+ M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, 0)
+ ..()
+
+/datum/reagent/consumable/daturajuice
+ name = "Datura Juice"
+ description = "Ground up bits of the datura plant. Mildly hallucinogenic."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#ACDFCE"
+ taste_description = "bitter leaves"
+
+/datum/reagent/consumable/daturajuice/on_mob_life(mob/living/carbon/M)
+ M.set_drugginess(5)
+ M.hallucination += 2
+ ..()
+
+/datum/reagent/consumable/coyotejuice
+ name = "Coyote Leaf Juice"
+ description = "Juiced coyote tobacco leaves. Stimulates the nervous system."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#168B64"
+ taste_description = "leaves"
+
+/datum/reagent/consumable/coyotejuice/on_mob_life(mob/living/carbon/M)
+ if(prob(10))
+ var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.")
+ to_chat(M, "[smoke_message]")
+ M.AdjustStun(-4, 0)
+ M.AdjustKnockdown(-4, 0)
+ M.AdjustUnconscious(-4, 0)
+ ..()
+
+/datum/reagent/consumable/cavefungusjuice
+ name = "Cave Fungus Juice"
+ description = "Juiced cave fungus fruiting bodies."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#274E13"
+ taste_description = "nuts"
+
+/datum/reagent/consumable/cavefungusjuice/on_mob_life(mob/living/carbon/M)
+ M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, 0)
+ ..()
+
+/datum/reagent/consumable/tato_juice
+ name = "Tato Juice"
+ description = "Juiced tatos."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#274E13"
+ taste_description = "tato"
+
+
+
/datum/reagent/consumable/blackpepper
name = "Black Pepper"
description = "A powder ground from peppercorns. *AAAACHOOO*"
@@ -889,4 +969,3 @@
taste_mult = 2
taste_description = "fizzy sweetness"
value = REAGENT_VALUE_COMMON
-
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index d077d2aebc..d914c2b270 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -910,7 +910,7 @@
/datum/reagent/aslimetoxin/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(method != TOUCH)
L.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
-*/
+*/
/datum/reagent/gluttonytoxin
name = "Gluttony's Blessing"
@@ -2594,6 +2594,11 @@ datum/reagent/eldritch
color = "#E6E6DA"
taste_mult = 0
+/datum/reagent/celugel
+ name = "Plasticized Cellulose"
+ description = "A plastic formed from esterized cellulose fibers. Organic!"
+ reagent_state = SOLID
+ color = "#E6E6DA"
/datum/reagent/hairball
name = "Hairball"
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index a1c0e0c0b9..5d2effc43d 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -70,3 +70,75 @@
results = list(/datum/reagent/moonsugar = 1, /datum/reagent/medicine/morphine = 2.5)
required_temp = 315 //a little above normal body temperature
required_reagents = list(/datum/reagent/drug/skooma = 1)
+
+/datum/chemical_reaction/jet
+ name = "Jet"
+ id = /datum/reagent/drug/jet
+ results = list(/datum/reagent/drug/jet = 3)
+ required_reagents = list(/datum/reagent/drug/nicotine = 2, /datum/reagent/consumable/milk = 2, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1)
+ OptimalTempMin = 600
+ OptimalTempMax = 675
+ ExplodeTemp = 700
+ OptimalpHMin = 8
+ OptimalpHMax = 10
+ ReactpHLim = 2
+ CurveSharpT = 5
+ CurveSharppH = 0.7
+ ThermicConstant = -6
+ HIonRelease = -0.5
+ RateUpLim = 5
+ FermiChem = TRUE
+
+/datum/chemical_reaction/turbo
+ name = "Turbo"
+ id = /datum/reagent/drug/turbo
+ results = list(/datum/reagent/drug/turbo = 2)
+ required_reagents = list(/datum/reagent/consumable/ferajuice = 3, /datum/reagent/consumable/agavejuice = 3, /datum/reagent/consumable/ethanol = 1)
+ OptimalTempMin = 410
+ OptimalTempMax = 525
+ ExplodeTemp = 585
+ OptimalpHMin = 4
+ OptimalpHMax = 7
+ ReactpHLim = 2
+ CurveSharpT = 5
+ CurveSharppH = 0.7
+ ThermicConstant = 8
+ HIonRelease = 0.5
+ RateUpLim = 5
+ FermiChem = TRUE
+
+/datum/chemical_reaction/psycho
+ name = "Psycho"
+ id = /datum/reagent/drug/psycho
+ results = list(/datum/reagent/drug/psycho = 2)
+ required_reagents = list(/datum/reagent/consumable/ferajuice = 3, /datum/reagent/consumable/cavefungusjuice = 3, /datum/reagent/consumable/nuka_cola = 1)
+ OptimalTempMin = 273
+ OptimalTempMax = 303
+ ExplodeTemp = 323
+ OptimalpHMin = 3
+ OptimalpHMax = 5
+ ReactpHLim = 1
+ CurveSharpT = 5
+ CurveSharppH = 0.7
+ ThermicConstant = 7
+ HIonRelease = 0.5
+ RateUpLim = 5
+ FermiChem = TRUE
+
+/datum/chemical_reaction/buffout
+ name = "Buffout"
+ id = /datum/reagent/drug/buffout
+ results = list(/datum/reagent/drug/buffout = 2)
+ required_reagents = list(/datum/reagent/consumable/yuccajuice = 3, /datum/reagent/consumable/mutjuice = 3, /datum/reagent/consumable/ethanol/buffalo = 3, /datum/reagent/consumable/nuka_cola = 3, /datum/reagent/carbondioxide = 1, /datum/reagent/nitrous_oxide = 1)
+ OptimalTempMin = 165
+ OptimalTempMax = 215
+ ExplodeTemp = 223
+ OptimalpHMin = 8
+ OptimalpHMax = 10
+ ReactpHLim = 1
+ CurveSharpT = 5
+ CurveSharppH = 0.7
+ ThermicConstant = 15
+ HIonRelease = 0.5
+ RateUpLim = 1
+ FermiChem = TRUE
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index 0e22bf81f5..d123b4354d 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -152,7 +152,7 @@ datum/chemical_reaction/rezadone
name = "Pentetic Jelly"
id = /datum/reagent/medicine/pen_acid/pen_jelly
results = list(/datum/reagent/medicine/pen_acid/pen_jelly = 2)
- required_reagents = list(/datum/reagent/medicine/pen_acid = 1, /datum/reagent/toxin/slimejelly = 1)
+ required_reagents = list(/datum/reagent/medicine/pen_acid = 1, /datum/reagent/celugel = 1)
/datum/chemical_reaction/sal_acid
name = "Salicyclic Acid"
@@ -260,7 +260,7 @@ datum/chemical_reaction/rezadone
name = "Pyroxadone"
id = /datum/reagent/medicine/pyroxadone
results = list(/datum/reagent/medicine/pyroxadone = 2)
- required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/toxin/slimejelly = 1)
+ required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/celugel = 1)
/datum/chemical_reaction/clonexadone
name = "Clonexadone"
@@ -303,7 +303,7 @@ datum/chemical_reaction/rezadone
name = "Regenerative Jelly"
id = /datum/reagent/medicine/regen_jelly
results = list(/datum/reagent/medicine/regen_jelly = 2)
- required_reagents = list(/datum/reagent/medicine/tricordrazine = 1, /datum/reagent/toxin/slimejelly = 1)
+ required_reagents = list(/datum/reagent/medicine/tricordrazine = 1, /datum/reagent/celugel = 1)
/datum/chemical_reaction/jelly_convert
name = "Blood Jelly Conversion"
@@ -391,7 +391,7 @@ datum/chemical_reaction/rezadone
/datum/chemical_reaction/stimpak2
name = "Imitation Stimpak Fluid"
id = /datum/reagent/medicine/stimpakimitation
- results = list(/datum/reagent/medicine/stimpakimitation = 1)
+ results = list(/datum/reagent/medicine/stimpakimitation = 3)
required_reagents = list(/datum/reagent/consumable/brocjuice = 3, /datum/reagent/consumable/xanderjuice = 3)
OptimalTempMin = 500 // Lower area of bell curve for determining heat based rate reactions
OptimalTempMax = 650 // Upper end for above
@@ -407,6 +407,43 @@ datum/chemical_reaction/rezadone
FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics
FermiExplode = FALSE //If the chemical explodes in a special way
+/datum/chemical_reaction/superstimpak
+ name = "Super Stimpak Fluid"
+ id = /datum/reagent/medicine/super_stimpak
+ results = list(/datum/reagent/medicine/super_stimpak = 2)
+ required_reagents = list(/datum/reagent/blood/synthetics = 1, /datum/reagent/drug/aranesp = 1, /datum/reagent/medicine/stimpak = 1, /datum/reagent/consumable/mutjuice = 1)
+ OptimalTempMin = 65
+ OptimalTempMax = 95
+ ExplodeTemp = 100
+ OptimalpHMin = 0.5
+ OptimalpHMax = 3
+ ReactpHLim = 1
+ CurveSharpT = 1 //flat tcurve
+ CurveSharppH = 0.5
+ ThermicConstant = 5
+ HIonRelease = 0.75
+ RateUpLim = 50 //this seems quite high but 1. runaway thermals 2. it's very slow since it's 100K
+ FermiChem = TRUE
+ FermiExplode = FALSE
+
+/datum/chemical_reaction/medx
+ name = "Med-X"
+ id = /datum/reagent/medicine/medx
+ results = list(/datum/reagent/medicine/medx = 2)
+ required_reagents = list(/datum/reagent/consumable/ethanol/pungajuice = 1, /datum/reagent/consumable/daturajuice = 1, /datum/reagent/consumable/coyotejuice = 1, /datum/reagent/medicine/stimpakimitation = 1)
+ OptimalTempMin = 800
+ OptimalTempMax = 821
+ ExplodeTemp = 824
+ OptimalpHMin = 11
+ OptimalpHMax = 14
+ ReactpHLim = 1
+ CurveSharpT = 10
+ CurveSharppH = 0.5
+ ThermicConstant = 8
+ HIonRelease = -0.5
+ RateUpLim = 40
+ FermiChem = TRUE
+
/datum/chemical_reaction/mentats
name = "mentats"
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 1a4d48787a..ab951cc267 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -850,6 +850,28 @@
required_reagents = list(/datum/reagent/cellulose = 1)
required_temp = 512
+
+/datum/chemical_reaction/celugel
+ name = "Cellulose Plasticization"
+ id = /datum/reagent/celugel
+ required_catalysts = list(/datum/reagent/lithium = 5, /datum/reagent/chlorine = 5)
+ results = list(/datum/reagent/celugel = 3)
+ required_reagents = list(/datum/reagent/cellulose = 1, /datum/reagent/diethylamine = 1, /datum/reagent/fermi/acidic_buffer = 0.5, /datum/reagent/acetone = 1, /datum/reagent/carbondioxide = 1) //not a super easy recipe as it replaces a hard-to-get chemical
+ OptimalTempMin = 430
+ OptimalTempMax = 520
+ ExplodeTemp = 9999
+ OptimalpHMin = 3
+ OptimalpHMax = 6
+ ReactpHLim = 2
+ CurveSharpT = 5
+ CurveSharppH = 0.5
+ ThermicConstant = 4
+ HIonRelease = 0.1
+ RateUpLim = 5
+ FermiChem = TRUE
+ FermiExplode = FALSE
+
+
/datum/chemical_reaction/nutracid_reaction
name = "Nutracid Nutriment Reaction"
id = "nutracid"
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 0c954c0450..8a758ed252 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -417,8 +417,8 @@
name = "Energized Jelly"
id = /datum/reagent/teslium/energized_jelly
results = list(/datum/reagent/teslium/energized_jelly = 2)
- required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/teslium = 1)
- mix_message = "The slime jelly starts glowing intermittently."
+ required_reagents = list(/datum/reagent/celugel = 1, /datum/reagent/teslium = 1)
+ mix_message = "The cellulose gel starts glowing intermittently."
/datum/chemical_reaction/reagent_explosion/teslium_lightning
name = "Teslium Destabilization"
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index ec734af764..4cd79a1306 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -155,3 +155,10 @@
labelled = 1
blood_type = null
list_reagents = list(/datum/reagent/medicine/radaway = 200)
+
+
+/obj/item/reagent_containers/blood/small
+ name = "small blood pack"
+ volume = 150 //same as plasbucket
+ w_class = WEIGHT_CLASS_SMALL
+ reagent_flags = INJECTABLE | DRAINABLE | AMOUNT_VISIBLE
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index a639f71c13..face6d75b2 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -421,6 +421,14 @@
build_path = /obj/item/reagent_containers/glass/beaker/large
category = list("initial", "Medical")
+/datum/design/xl_beaker
+ name = "Extra-Large Beaker"
+ id = "xl_beaker"
+ build_type = AUTOLATHE
+ materials = list(MAT_GLASS = 2500, /datum/material/plastic = 3000)
+ build_path = /obj/item/reagent_containers/glass/beaker/plastic
+ category = list("initial", "Medical")
+
/datum/design/solids
name = "Solid Beaker"
id = "solids"
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 8f8500e69f..21a3474b94 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
@@ -172,6 +172,23 @@
category = list("initial", "Medical","Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/xl_beaker
+ name = "Extra-Large Beaker"
+ id = "xl_beaker"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000)
+ build_path = /obj/item/reagent_containers/glass/beaker/plastic
+ category = list("initial", "Medical")
+
+/datum/design/blood_bag_s
+ name = "Empty Small Blood Bag"
+ desc = "A small sterilized plastic bag for blood."
+ id = "blood_bag_s"
+ build_path = /obj/item/reagent_containers/blood/small
+ build_type = AUTOLATHE
+ materials = list(/datum/material/glass = 1500, /datum/material/plastic = 3500)
+ category = list("initial", "Medical")
+
/datum/design/healthanalyzer
name = "Health Analyzer"
id = "healthanalyzer"
diff --git a/code/modules/research/designs/autoylathe_designs.dm b/code/modules/research/designs/autoylathe_designs.dm
index 354fbfe53d..f7ff0208fc 100644
--- a/code/modules/research/designs/autoylathe_designs.dm
+++ b/code/modules/research/designs/autoylathe_designs.dm
@@ -437,13 +437,6 @@
build_path = /obj/item/toy/figure/wizard
category = list("hacked", "Figurines")
-/datum/design/autoylathe/dildo
- name = "Customizable Dildo"
- id = "dildo"
- materials = list(/datum/material/plastic = 2000)
- build_path = /obj/item/dildo/custom
- category = list("initial", "Adult")
-
/datum/design/autoylathe/collar
name = "Collar"
id = "collar"
diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
index 99caa5b480..8ea883edf1 100644
--- a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
+++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
@@ -21,14 +21,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
-/datum/design/board/minesweeper
- name = "Computer Design (Minesweeper Arcade Machine)"
- desc = "Allows for the construction of circuit boards used to build a new Minesweeper machine."
- id = "arcade_minesweeper"
- build_path = /obj/item/circuitboard/computer/arcade/minesweeper
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_ALL
-
/datum/design/board/slot_machine
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
diff --git a/code/modules/research/techweb/nodes/computer_hud_nodes.dm b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
index 1c83ddd4c6..02c1606e71 100644
--- a/code/modules/research/techweb/nodes/computer_hud_nodes.dm
+++ b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
@@ -60,5 +60,5 @@
display_name = "Games and Toys"
description = "For the slackers on the station."
prereq_ids = list("comptech")
- design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe")
+ design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm
index 6af9ebf731..789da6ee7a 100644
--- a/code/modules/surgery/burn_dressing.dm
+++ b/code/modules/surgery/burn_dressing.dm
@@ -48,8 +48,8 @@
"[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)]!")
log_combat(user, target, "excised infected flesh in", addition="INTENT: [uppertext(user.a_intent)]")
surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND)
- burn_wound.infestation -= 0.5
- burn_wound.sanitization += 0.5
+ burn_wound.infestation -= 0.85
+ burn_wound.sanitization += 0.75
if(burn_wound.infestation <= 0)
repeatable = FALSE
else
diff --git a/fortune13.dme b/fortune13.dme
index 91ff9f269b..97d639cf42 100644
--- a/fortune13.dme
+++ b/fortune13.dme
@@ -881,7 +881,6 @@
#include "code\game\machinery\computer\teleporter.dm"
#include "code\game\machinery\computer\terminal.dm"
#include "code\game\machinery\computer\arcade\battle.dm"
-#include "code\game\machinery\computer\arcade\minesweeper.dm"
#include "code\game\machinery\computer\arcade\misc_arcade.dm"
#include "code\game\machinery\computer\arcade\orion_trail.dm"
#include "code\game\machinery\computer\prisoner\_prisoner.dm"
@@ -1745,7 +1744,6 @@
#include "code\modules\arousal\organs\testicles.dm"
#include "code\modules\arousal\organs\vagina.dm"
#include "code\modules\arousal\organs\womb.dm"
-#include "code\modules\arousal\toys\dildos.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\bomb.dm"
#include "code\modules\assembly\doorcontrol.dm"
@@ -2244,11 +2242,14 @@
#include "code\modules\hydroponics\beekeeping\beekeeper_suit.dm"
#include "code\modules\hydroponics\beekeeping\honey_frame.dm"
#include "code\modules\hydroponics\beekeeping\honeycomb.dm"
+#include "code\modules\hydroponics\grown\agave.dm"
#include "code\modules\hydroponics\grown\ambrosia.dm"
#include "code\modules\hydroponics\grown\apple.dm"
#include "code\modules\hydroponics\grown\banana.dm"
#include "code\modules\hydroponics\grown\beans.dm"
#include "code\modules\hydroponics\grown\berries.dm"
+#include "code\modules\hydroponics\grown\broc.dm"
+#include "code\modules\hydroponics\grown\buffalogourd.dm"
#include "code\modules\hydroponics\grown\cannabis.dm"
#include "code\modules\hydroponics\grown\cereals.dm"
#include "code\modules\hydroponics\grown\chili.dm"
@@ -2256,29 +2257,41 @@
#include "code\modules\hydroponics\grown\cocoa_vanilla.dm"
#include "code\modules\hydroponics\grown\corn.dm"
#include "code\modules\hydroponics\grown\cotton.dm"
+#include "code\modules\hydroponics\grown\coyotetobacco.dm"
+#include "code\modules\hydroponics\grown\datura.dm"
#include "code\modules\hydroponics\grown\eggplant.dm"
+#include "code\modules\hydroponics\grown\feracactus.dm"
#include "code\modules\hydroponics\grown\flowers.dm"
#include "code\modules\hydroponics\grown\garlic.dm"
#include "code\modules\hydroponics\grown\grass_carpet.dm"
+#include "code\modules\hydroponics\grown\horsenettle.dm"
#include "code\modules\hydroponics\grown\melon.dm"
+#include "code\modules\hydroponics\grown\mesquite.dm"
#include "code\modules\hydroponics\grown\misc.dm"
#include "code\modules\hydroponics\grown\mushrooms.dm"
+#include "code\modules\hydroponics\grown\mutfruit.dm"
#include "code\modules\hydroponics\grown\nettle.dm"
#include "code\modules\hydroponics\grown\onion.dm"
#include "code\modules\hydroponics\grown\peach.dm"
#include "code\modules\hydroponics\grown\peanuts.dm"
#include "code\modules\hydroponics\grown\peas.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
+#include "code\modules\hydroponics\grown\pinyon.dm"
#include "code\modules\hydroponics\grown\potato.dm"
+#include "code\modules\hydroponics\grown\prickly.dm"
#include "code\modules\hydroponics\grown\pumpkin.dm"
+#include "code\modules\hydroponics\grown\punga.dm"
#include "code\modules\hydroponics\grown\rainbow_bunch.dm"
#include "code\modules\hydroponics\grown\random.dm"
#include "code\modules\hydroponics\grown\replicapod.dm"
#include "code\modules\hydroponics\grown\root.dm"
+#include "code\modules\hydroponics\grown\tato.dm"
#include "code\modules\hydroponics\grown\tea_coffee.dm"
#include "code\modules\hydroponics\grown\tobacco.dm"
#include "code\modules\hydroponics\grown\tomato.dm"
#include "code\modules\hydroponics\grown\towercap.dm"
+#include "code\modules\hydroponics\grown\xander.dm"
+#include "code\modules\hydroponics\grown\yucca.dm"
#include "code\modules\instruments\instrument_data\_instrument_data.dm"
#include "code\modules\instruments\instrument_data\_instrument_key.dm"
#include "code\modules\instruments\instrument_data\brass.dm"
diff --git a/icons/fallout/UI/buttons_fallout2.dmi b/icons/fallout/UI/buttons_fallout2.dmi
index 5f03c465a2..7baa9b069f 100644
Binary files a/icons/fallout/UI/buttons_fallout2.dmi and b/icons/fallout/UI/buttons_fallout2.dmi differ
diff --git a/icons/fallout/clothing/hats.dmi b/icons/fallout/clothing/hats.dmi
index 2eef1bc1cb..5a80efcb1d 100644
Binary files a/icons/fallout/clothing/hats.dmi and b/icons/fallout/clothing/hats.dmi differ
diff --git a/icons/fallout/onmob/clothes/head.dmi b/icons/fallout/onmob/clothes/head.dmi
index 4a6986322c..0ada71ec0e 100644
Binary files a/icons/fallout/onmob/clothes/head.dmi and b/icons/fallout/onmob/clothes/head.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 032f728d08..658107daac 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi
index 615e88f684..5c3f378ced 100644
Binary files a/icons/obj/stairs.dmi and b/icons/obj/stairs.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index 48e0680ae0..dde2700da0 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -109,6 +109,34 @@
path = /obj/item/clothing/suit/f13/autumn
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
cost = 3
+
+/datum/gear/suit/ncrcfjacket
+ name = "NCRCF jacket"
+ path = /obj/item/clothing/suit/armor/f13/ncrcfjacket
+ cost = 1
+
+/datum/gear/suit/NCRutilityvest
+ name = "Utility Vest"
+ path = /obj/item/clothing/suit/armor/f13/utilityvest
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
+ cost = 4
+ restricted_desc = "NCR"
+ restricted_roles = list("NCR Captain",
+ "NCR Lieutenant",
+ "NCR Medical Officer",
+ "NCR Veteran Ranger",
+ "NCR Lieutenant",
+ "NCR Heavy Trooper",
+ "NCR Sergeant First Class",
+ "NCR Sergeant",
+ "NCR Corporal",
+ "NCR Combat Engineer",
+ "NCR Combat Medic",
+ "NCR Trooper",
+ "NCR Rear Echelon",
+ "NCR Off-Duty",
+ )
+
/datum/gear/suit/fieldscribe
name = "Fieldscribe suit"
@@ -150,6 +178,18 @@
"Detective",
"Barkeep",
)
+
+/datum/gear/suit/deputyvest
+ name = "OPD armor vest"
+ path = /obj/item/clothing/suit/armor/vest/oasis
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
+ cost = 5
+ restricted_desc = "Oasis Police"
+ restricted_roles = list("Sheriff",
+ "Deputy",
+ "Detective",
+ )
+
/datum/gear/suit/hazardvest
name = "Hazard Vest"
path = /obj/item/clothing/suit/hazardvest
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 4b1e9ffa8d..a0365f9a9d 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -10,6 +10,10 @@
/datum/gear/uniform/caravaneer
name = "caravaneer outfit"
path = /obj/item/clothing/under/f13/caravaneer
+
+/datum/gear/uniform/ncrcf
+ name = "NCRCF outfit"
+ path = /obj/item/clothing/under/f13/ncrcf
/datum/gear/uniform/brahminskin
name = "brahmin skin outfit"