Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
9efc1d3
New areas
antlersss Apr 28, 2026
5efff11
Room layouts
antlersss Apr 28, 2026
672fd4f
First Draft
antlersss Apr 29, 2026
78fc1f4
fix malformed field
antlersss Apr 29, 2026
b334639
Merge branch 'master' into brig
antlersss Apr 29, 2026
268de74
Remove banned neighbors
antlersss Apr 29, 2026
2df9384
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss Apr 29, 2026
1504f7d
Fixup maps in TGM format
antlersss Apr 29, 2026
1239201
add missing apc's
antlersss Apr 29, 2026
16b72a5
Fixup maps in TGM format
antlersss Apr 29, 2026
79c383e
Adds some missing utility items
antlersss Apr 29, 2026
47eb000
Fixup maps in TGM format
antlersss Apr 29, 2026
9ba4727
minor fixes (thanks LC4492)
antlersss May 3, 2026
1407453
Ledge smoothing pixel shift and layering tweaks
antlersss May 4, 2026
e24c891
Fixup maps in TGM format
antlersss May 4, 2026
27a2772
Hacking vendors and pixel shifts
antlersss May 4, 2026
cc19557
Fixup maps in TGM format
antlersss May 4, 2026
7c45338
This button
antlersss May 4, 2026
30369a1
These lattices
antlersss May 4, 2026
f280dfb
Ledge layering fix
antlersss May 4, 2026
0b5d53c
More nudges
antlersss May 4, 2026
6a95a68
Brig Cryopod + Bodybags
antlersss May 17, 2026
a0550cd
Fixup maps in TGM format
antlersss May 17, 2026
4afcb39
Adds cell flashers (oops)
antlersss May 24, 2026
9e21d58
Fixup maps in TGM format
antlersss May 24, 2026
3aa8941
Merge branch 'master' into brig
antlersss May 24, 2026
9a964ff
Final map review changes
antlersss May 25, 2026
ebec3fd
Fixup maps in TGM format
antlersss May 25, 2026
c338142
QA Testing Changes
antlersss May 26, 2026
5e81917
Fixup maps in TGM format
antlersss May 26, 2026
2e1423b
Kill all MP's
antlersss May 26, 2026
dd024eb
I hate layering
antlersss May 26, 2026
872cfab
Motion sensors, shutters, and doors
antlersss May 26, 2026
b469158
Fixup maps in TGM format
antlersss May 26, 2026
b74a26a
Remove useless attachment + add useful one
antlersss May 26, 2026
0156644
Pouches in utility vendor
antlersss May 26, 2026
a7883e2
IV drip + Cell interior doors
antlersss May 26, 2026
df850d3
Paper template chest drawer icon fix
antlersss May 29, 2026
141431d
Games, wardens office, chairs, hoops, oh my!
antlersss May 29, 2026
3bf287f
Fixup maps in TGM format
antlersss May 29, 2026
939acde
Merge branch 'master' into brig
antlersss May 29, 2026
f2a210c
Whitespace
antlersss May 29, 2026
a249080
Refactor new filing cabinets
antlersss May 29, 2026
230bb44
Visitation access
antlersss May 30, 2026
dacb1b6
Pipes & airlock cycles
antlersss May 31, 2026
d95fde7
Fixup maps in TGM format
antlersss May 31, 2026
a6cf3c3
Merge remote-tracking branch 'upstream/master' into brig
antlersss Jun 8, 2026
c66a9e7
Merge branch 'master' into brig
antlersss Jun 9, 2026
166ff30
67
antlersss Jun 11, 2026
0754799
Vendor & Armory
antlersss Jun 13, 2026
8f5e884
Fixup maps in TGM format
antlersss Jun 13, 2026
be87bb9
Merge branch 'cmss13-devs:master' into brig
antlersss Jun 13, 2026
f0793f5
Malformed field
antlersss Jun 13, 2026
2cca96f
Merge remote-tracking branch 'upstream/master' into brig
antlersss Jun 13, 2026
af4aec2
Hijack area checks
antlersss Jun 15, 2026
dd88a2d
Plastic cutting
antlersss Jun 17, 2026
1a08bc2
Area fixes
antlersss Jun 17, 2026
439139a
Merge branch 'cmss13-devs:master' into brig
antlersss Jun 17, 2026
cf114fe
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss Jun 17, 2026
5117b87
Rolling TV
antlersss Jun 17, 2026
1d36927
Add rolling TV
antlersss Jun 17, 2026
4455a5a
Fixup maps in TGM format
antlersss Jun 17, 2026
0fcc78a
Dull knives
antlersss Jun 18, 2026
6585a1e
Update code/game/objects/items/reagent_containers/food/fish_snacks.dm
antlersss Jun 18, 2026
78356cc
Update code/game/machinery/computer/camera_console.dm
antlersss Jun 18, 2026
87d720f
RC's
antlersss Jun 18, 2026
c3dccfd
Lint
antlersss Jun 18, 2026
3c3553f
Fix filing cabinet merge conflicts
antlersss Jun 22, 2026
9308e69
Hardened APCs
antlersss Jun 22, 2026
42e945f
Merge remote-tracking branch 'upstream/master' into brig
antlersss Jun 23, 2026
3961040
VHS Sprites
antlersss Jun 24, 2026
3df20ba
More
antlersss Jun 24, 2026
e8c98ca
Update meat.dm
antlersss Jun 28, 2026
54a92a2
Merge remote-tracking branch 'upstream/master' into brig
antlersss Jun 30, 2026
31b303a
67 is dead.
antlersss Jun 30, 2026
846167b
Repath plastic knives
antlersss Jun 30, 2026
292b5fc
Fixup maps in TGM format
antlersss Jun 30, 2026
ec3848c
Update plastic utensil paths
antlersss Jul 1, 2026
4f9af8f
Add path script
antlersss Jul 1, 2026
902266d
Apply suggestions from code review
antlersss Jul 1, 2026
ba9283d
Ok
antlersss Jul 1, 2026
6ee8062
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss Jul 1, 2026
e6b1f4b
Metadata fix?
antlersss Jul 6, 2026
10f66c4
Try again
antlersss Jul 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/__DEFINES/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,11 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be

/// How many fields maximum are allowed on papers
#define PAPER_MAX_FIELDS 51

// Filing cabinet defines
#define FILING_CABINET_NORMAL "filingcabinet"
#define FILING_CABINET_CHEST "chestdrawer"
#define FILING_CABINET_TALL "tallcabinet"
#define FILING_CABINET_NORMAL_DOUBLE "filingcabinet_double"
#define FILING_CABINET_CHEST_DOUBLE "chestdrawer_double"
#define FILING_CABINET_TALL_DOUBLE "tallcabinet_double"
15 changes: 12 additions & 3 deletions code/game/area/almayer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,6 @@
/area/almayer/shipboard/brig/armory
name = "\improper Brig Armory"

/area/almayer/shipboard/brig/mp_bunks
name = "\improper Brig MP Bunks"

/area/almayer/shipboard/brig/starboard_hallway
name = "\improper Brig Starboard Hallway"

Expand All @@ -246,12 +243,24 @@
/area/almayer/shipboard/brig/interrogation
name = "\improper Brig Interrogation Room"

/area/almayer/shipboard/brig/visitation
name = "\improper Brig Visitation"

/area/almayer/shipboard/brig/visitation_waiting
name = "\improper Brig Visitation Waiting Room"

/area/almayer/shipboard/brig/yard
name = "\improper Brig Yard"

/area/almayer/shipboard/brig/general_equipment
name = "\improper Brig General Equipment"

/area/almayer/shipboard/brig/evidence_storage
name = "\improper Brig Evidence Storage"

/area/almayer/shipboard/brig/lower
name = "\improper Brig Lower Level"

/area/almayer/shipboard/brig/execution
name = "\improper Brig Execution Room"

Expand Down
8 changes: 7 additions & 1 deletion code/game/machinery/computer/HolodeckControl.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
anchored = TRUE
density = TRUE
throwpass = 1

var/enable_shimmy = TRUE
Comment thread
antlersss marked this conversation as resolved.
var/side = ""
var/id = ""

Expand Down Expand Up @@ -175,9 +177,13 @@

return ..()

/obj/structure/holohoop/noshimmy
enable_shimmy = FALSE

/obj/structure/holohoop/Initialize(mapload, ...)
. = ..()
AddComponent(/datum/component/shimmy_around, east_offset = -15, west_offset = -15, north_offset = 15, south_offset = 15)
if (enable_shimmy)
AddComponent(/datum/component/shimmy_around, east_offset = -15, west_offset = -15, north_offset = 15, south_offset = 15)

/obj/structure/machinery/readybutton
name = "Ready Declaration Device"
Expand Down
11 changes: 11 additions & 0 deletions code/game/machinery/computer/camera_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,17 @@
broadcastingcamera = null
return ..()

/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/wheeled
name = "Mobile Television Set"
desc = "An old TV hooked up to a video cassette recorder, bolted onto what appears to be an old roller bed. Only the finest for our Military Police force.\n\nIt could be used to keep perma prisoners entertained."
icon_state = "tv_mobile"
layer = WINDOW_LAYER

anchored = FALSE
drag_delay = 0
deconstructible = FALSE
density = TRUE

/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/ui_state(mob/user)
return GLOB.in_view

Expand Down
13 changes: 13 additions & 0 deletions code/game/machinery/vending/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,19 @@
products = list(/obj/item/tool/kitchen/tray = 8,/obj/item/tool/kitchen/utensil/fork = 6,/obj/item/tool/kitchen/knife = 3,/obj/item/reagent_container/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2,/obj/item/reagent_container/food/condiment/saltshaker = 4,/obj/item/reagent_container/food/condiment/peppermill = 4,/obj/item/reagent_container/food/condiment/enzyme = 1,/obj/item/reagent_container/food/condiment = 8)
contraband = list(/obj/item/tool/kitchen/utensil/spoon = 2,/obj/item/tool/kitchen/utensil/knife = 2,/obj/item/tool/kitchen/rollingpin = 2, /obj/item/tool/kitchen/knife/butcher = 2)

/obj/structure/machinery/vending/dinnerware/prison
products = list(
/obj/item/tool/kitchen/tray = 8,
/obj/item/tool/kitchen/utensil/fork/plastic = 6,
/obj/item/tool/kitchen/utensil/knife/plastic = 3,
/obj/item/reagent_container/food/drinks/sillycup = 8,
/obj/item/clothing/suit/chef/classic = 2,
/obj/item/reagent_container/food/condiment/saltshaker = 4,
/obj/item/reagent_container/food/condiment/peppermill = 4,
/obj/item/reagent_container/food/condiment/enzyme = 1,
/obj/item/reagent_container/food/condiment = 8,
)

/obj/structure/machinery/vending/dinnerware/yautja
name = "dinnerplate dispenser"
desc = "A kitchen and restaurant equipment vendor."
Expand Down
68 changes: 68 additions & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,74 @@
list("M44 Magnum Sharpshooter Stock", 1.5, /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR)
)

/obj/structure/machinery/cm_vending/sorted/attachments/mp_extended
name = "\improper SecTech General Utility Vendor"
desc = "An automated supply rack for all your military policing needs. This one is special-made so you don't have to mingle with the masses."
req_access = list(ACCESS_MARINE_BRIG)
icon_state = "req_ammo"
vend_dir = WEST
vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND

listed_products = list(
list("ATTACHMENTS", -1, null, null),
list("Extended Barrel", 1, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("Suppressor", 3, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),
list("Suppressor, Compact", 3, /obj/item/attachable/suppressor/sleek, VENDOR_ITEM_REGULAR),
list("S5 Red-Dot Sight", 3, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR),
list("S5-Micro Dot Sight", 3, /obj/item/attachable/reddot/small, VENDOR_ITEM_RECOMMENDED),
list("S6 Reflex Sight", 3, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 3, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 3, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 2, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Laser Sight", 3, /obj/item/attachable/lasersight, VENDOR_ITEM_RECOMMENDED),
list("Underbarrel Flashlight Grip", 6, /obj/item/attachable/flashlight/grip, VENDOR_ITEM_REGULAR),

list("BELTS", -1, null, null),
list("M276 Pattern Shotgun Shell Loading Rig", 8, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Pistol Holster Rig", 8, /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Revolver Holster Rig", 8, /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 G8-A General Utility Pouch", 8, /obj/item/storage/backpack/general_belt, VENDOR_ITEM_RECOMMENDED),

list("POUCHES", -1, null, null),
list("Small Document Pouch", 8, /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
list("Magazine Pouch", 8, /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", 8, /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
list("Medium General Pouch", 8, /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR),
list("Pistol Magazine Pouch", 8, /obj/item/storage/pouch/magazine/pistol, VENDOR_ITEM_REGULAR),

list("STANDARD EQUIPMENT", -1, null, null, null),
list("Marine Combat Boots", 8, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Boots", 8, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Boots", 8, /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR),
list("Marine Combat Gloves", 8, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Gloves", 8, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Black Combat Gloves", 8, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Gloves", 8, /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR),
list("Marine Fingerless Combat Gloves", 8, /obj/item/clothing/gloves/marine/fingerless, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null, null),
list("Ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", 8, /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("M5 Integrated Gas Mask", 8, /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
list("M10 Helmet Netting", 8, /obj/item/clothing/accessory/helmet/cover/netting, VENDOR_ITEM_REGULAR),
list("M10 Helmet Rain Cover", 8, /obj/item/clothing/accessory/helmet/cover/raincover, VENDOR_ITEM_REGULAR),
list("Firearm Lubricant", 8, /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
list("Attachable Dogtags", 8, /obj/item/clothing/accessory/dogtags, VENDOR_ITEM_REGULAR),
list("USCM Flair", 8, /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
list("Falling Falcons Shoulder Patch", 8, /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR),
list("Falling Falcons UA Shoulder Patch", 8, /obj/item/clothing/accessory/patch/falconalt, VENDOR_ITEM_REGULAR),
list("USCM Large Chest Patch", 8, /obj/item/clothing/accessory/patch/uscmlarge, VENDOR_ITEM_REGULAR),
list("USCM Shoulder Patch", 8, /obj/item/clothing/accessory/patch/uscmpatch, VENDOR_ITEM_REGULAR),
list("United Americas Shoulder patch", 8, /obj/item/clothing/accessory/patch/ua, VENDOR_ITEM_REGULAR),
list("United Americas Flag Shoulder patch", 8, /obj/item/clothing/accessory/patch/uasquare, VENDOR_ITEM_REGULAR),
)

// Don't have the MP attachment vendor scale with pop size
/obj/structure/machinery/cm_vending/sorted/attachments/mp_extended/populate_product_list(scale)
return

//------------ESSENTIAL SETS---------------
/obj/effect/essentials_set/random/uscm_light_armor
spawned_gear_list = list(
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/food/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
icon_state = "water_cup_e"
item_state = "water_cup_e"
possible_transfer_amounts = null
volume = 10
volume = 30
center_of_mass = "x=16;y=12"

/obj/item/reagent_container/food/drinks/sillycup/Initialize()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
if(!guttable)
to_chat(user, SPAN_WARNING("[src] cannot be gutted."))
return
if(W.sharp == IS_SHARP_ITEM_ACCURATE || W.sharp == IS_SHARP_ITEM_BIG)
if(W.sharp)
user.visible_message("[user] cuts [src] open and cleans it.", "You gut [src].")
playsound(loc, 'sound/effects/blobattack.ogg', 25, 1)
var/gut_loot = roll(total_length / 2 - min_length)
Expand Down
5 changes: 3 additions & 2 deletions code/game/objects/items/reagent_containers/food/snacks.dm
Comment thread
antlersss marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@
if(istype(W,/obj/item/storage))
..() // -> item/attackby()

if(istype(W,/obj/item/tool/kitchen/utensil))
// No longer scoop up food with knife utensils, instead try to actually cut with them
if(istype(W,/obj/item/tool/kitchen/utensil) && !istype(W,/obj/item/tool/kitchen/utensil/knife))

var/obj/item/tool/kitchen/utensil/U = W

Expand Down Expand Up @@ -196,7 +197,7 @@
return 0

var/inaccurate = 0
if(W.sharp == IS_SHARP_ITEM_BIG)
if(W.sharp == IS_SHARP_ITEM_BIG || W.sharp == IS_SHARP_ITEM_SIMPLE)
inaccurate = 1
else if(W.sharp != IS_SHARP_ITEM_ACCURATE)
return 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
name = made_from_player + name

/obj/item/reagent_container/food/snacks/meat/attackby(obj/item/W as obj, mob/user as mob)
if(W.sharp == IS_SHARP_ITEM_ACCURATE || W.sharp == IS_SHARP_ITEM_BIG)
if(W.sharp)
var/turf/T = get_turf(src)
var/cutlet_amt = roll(1,4)
for(var/i in 1 to cutlet_amt)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/stacks/sheets/mineral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ GLOBAL_LIST_INIT(phoron_recipes, list ( \
GLOBAL_LIST_INIT(plastic_recipes, list ( \
new/datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
new/datum/stack_recipe("plastic fork", /obj/item/tool/kitchen/utensil/pfork, 1, on_floor = 1), \
new/datum/stack_recipe("plastic spoon", /obj/item/tool/kitchen/utensil/pspoon, 1, on_floor = 1), \
new/datum/stack_recipe("plastic knife", /obj/item/tool/kitchen/utensil/pknife, 1, on_floor = 1), \
new/datum/stack_recipe("plastic fork", /obj/item/tool/kitchen/utensil/fork/plastic, 1, on_floor = 1), \
new/datum/stack_recipe("plastic spoon", /obj/item/tool/kitchen/utensil/spoon/plastic, 1, on_floor = 1), \
new/datum/stack_recipe("plastic knife", /obj/item/tool/kitchen/utensil/knife/plastic, 1, on_floor = 1), \
))

GLOBAL_LIST_INIT(iron_recipes, list ( \
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/mre.dm
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
AddElement(/datum/element/corp_label/norcomm)

/obj/item/storage/box/mre/upp/choose_utencil()
new /obj/item/tool/kitchen/utensil/pspoon(src)
new /obj/item/tool/kitchen/utensil/spoon/plastic(src)

/obj/item/storage/box/mre/upp/choose_drink()
new /obj/item/reagent_container/food/drinks/cans/waterbottle/upp(src)
Expand Down
15 changes: 5 additions & 10 deletions code/game/objects/items/tools/kitchen_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
icon_state = "fork"
item_state = "fork"

/obj/item/tool/kitchen/utensil/pfork
/obj/item/tool/kitchen/utensil/fork/plastic
name = "plastic fork"
desc = "Yay, no washing up to do."
icon_state = "pfork"
Expand All @@ -91,7 +91,7 @@
item_state = "spoon"
attack_verb = list("attacked", "poked")

/obj/item/tool/kitchen/utensil/pspoon
/obj/item/tool/kitchen/utensil/spoon/plastic
name = "plastic spoon"
desc = "It's a plastic spoon. How dull."
icon_state = "pspoon"
Expand Down Expand Up @@ -130,7 +130,7 @@
if(.)
playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 5)

/obj/item/tool/kitchen/utensil/pknife
/obj/item/tool/kitchen/utensil/knife/plastic
name = "plastic knife"
desc = "The bluntest of blades."
icon_state = "pknife"
Expand All @@ -139,13 +139,8 @@
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi'
)
item_state = "pknife"
force = 10
throwforce = 10

/obj/item/tool/kitchen/utensil/pknife/attack(target as mob, mob/living/user as mob)
. = ..()
if(.)
playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 5)
sharp = IS_SHARP_ITEM_SIMPLE
edge = FALSE

/*
* Kitchen knives
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@
new /obj/item/weapon/gun/rifle/m4ra(src)
new /obj/item/ammo_box/magazine/m4ra(src)

// 2 m42a cabinet are in brig armory (m41a guns and 12 mags)
/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle

/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle/Initialize()
. = ..()
new /obj/item/weapon/gun/rifle/m41a(src)
new /obj/item/weapon/gun/rifle/m41a(src)
new /obj/item/weapon/gun/rifle/m41a(src)
new /obj/item/weapon/gun/rifle/m41a(src)
new /obj/item/ammo_box/magazine(src)

// EXECUTION CHAMBER might add that here need to ask first... will reskin if asked.


Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,6 @@
max_storage_space = 5
can_hold = list(
/obj/item/tool/kitchen/utensil/knife,
/obj/item/tool/kitchen/utensil/pknife,
/obj/item/tool/kitchen/knife,
/obj/item/attachable/bayonet,
/obj/item/weapon/throwing_knife,
Expand Down
20 changes: 14 additions & 6 deletions code/modules/paperwork/filingcabinet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
density = TRUE
anchored = TRUE
wrenchable = TRUE

// Initial cabinet type variable added, because initial(icon_state) does not work as intended for objects changed in map prefabs
var/list/cabinet_type = FILING_CABINET_NORMAL
var/list/allowed_types = list(/obj/item/paper, /obj/item/folder, /obj/item/clipboard, /obj/item/photo, /obj/item/paper_bundle, /obj/item/pamphlet)

/obj/structure/filingcabinet/proc/dump_contents()
Expand All @@ -33,21 +36,26 @@
/obj/structure/filingcabinet/double
name = "filing cabinets"
desc = "Two large cabinets with drawers."
icon_state = "filingcabinet_double"
icon_state = FILING_CABINET_NORMAL_DOUBLE
cabinet_type = FILING_CABINET_NORMAL_DOUBLE

/obj/structure/filingcabinet/chestdrawer
name = "chest drawer"
icon_state = "chestdrawer"
icon_state = FILING_CABINET_CHEST
cabinet_type = FILING_CABINET_CHEST

/obj/structure/filingcabinet/chestdrawer/double
name = "chest drawers"
icon_state = "chestdrawer_double"
icon_state = FILING_CABINET_CHEST_DOUBLE
cabinet_type = FILING_CABINET_CHEST_DOUBLE

/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete
icon_state = "tallcabinet"
icon_state = FILING_CABINET_TALL
cabinet_type = FILING_CABINET_TALL

/obj/structure/filingcabinet/filingcabinet/double
icon_state = "tallcabinet_double"
icon_state = FILING_CABINET_TALL_DOUBLE
cabinet_type = FILING_CABINET_TALL_DOUBLE

/obj/structure/filingcabinet/Initialize()
. = ..()
Expand Down Expand Up @@ -99,7 +107,7 @@
icon_state = "[initial(icon_state)]-open"
addtimer(CALLBACK(src, "reset_icon"),0.5 SECONDS)
/obj/structure/filingcabinet/proc/reset_icon()
icon_state = initial(icon_state)
icon_state = cabinet_type

/* Automated Research Sorting Cabinet*/

Expand Down
1 change: 1 addition & 0 deletions code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@
/obj/item/paper/almayer_storage
name = "Almayer Emergency Storage Note"
info = "<i>Hey Garry, I got the boys to move most of the emergency supplies down into the ASRS hold just like ya' asked. <BR>Next time you're around Chinook I'll buy you a beer ok?</i>"

/obj/item/paper/Toxin
name = "Chemical Information"
info = "Known Onboard Toxins:<BR>\n\tGrade A Semi-Liquid Phoron:<BR>\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.<BR>\n\t\tA gas mask fails to filter phoron after 50 units.<BR>\n\t\tWill attempt to diffuse like a gas.<BR>\n\t\tFiltered by scrubbers.<BR>\n\t\tThere is a bottled version which is very different<BR>\n\t\t\tfrom the version found in canisters!<BR>\n<BR>\n\t\tWARNING: Highly Flammable. Keep away from heat sources<BR>\n\t\texcept in a enclosed fire area!<BR>\n\t\tWARNING: It is a crime to use this without authorization.<BR>\nKnown Onboard Anti-Toxin:<BR>\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.<BR>\n\t\tBest if injected directly into bloodstream.<BR>\n\t\tA full injection is in every regular Med-Kit.<BR>\n\t\tSpecial toxin Kits hold around 7.<BR>\n<BR>\nKnown Onboard Chemicals (other):<BR>\n\tRejuvenation T#001:<BR>\n\t\tEven 1 unit injected directly into the bloodstream<BR>\n\t\t\twill cure paralysis and sleep phoron.<BR>\n\t\tIf administered to a dying patient it will prevent<BR>\n\t\t\tfurther damage for about units*3 seconds.<BR>\n\t\t\tit will not cure them or allow them to be cured.<BR>\n\t\tIt can be administered to a non-dying patient<BR>\n\t\t\tbut the chemicals disappear just as fast.<BR>\n\tSoporific T#054:<BR>\n\t\t5 units will induce precisely 1 minute of sleep.<BR>\n\t\t\tThe effect are cumulative.<BR>\n\t\tWARNING: It is a crime to use this without authorization!"
Expand Down
Loading