Skip to content

Commit

Permalink
Update food.dm and recipes_lizard.dm, remove
Browse files Browse the repository at this point in the history
oranges and replace carpmeat with fishmeat
  • Loading branch information
FalloutFalcon committed Nov 8, 2023
1 parent 532e15d commit b6ead5c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 16 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"Clothing", \
"Nuts", \
"Seafood", \
"Oranges", \
"Bugs", \
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
/datum/crafting_recipe/food/picoss_skewers
name = "Picoss skewers"
reqs = list(
/obj/item/reagent_containers/food/snacks/carpmeat = 2,
/obj/item/reagent_containers/food/snacks/fishmeat = 2,
/obj/item/reagent_containers/food/snacks/grown/onion = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/stack/rods = 1,
Expand Down Expand Up @@ -296,7 +296,7 @@
name = "BBQ fish flatbread"
reqs = list(
/obj/item/reagent_containers/food/snacks/root_flatbread = 1,
/obj/item/reagent_containers/food/snacks/carpmeat = 2,
/obj/item/reagent_containers/food/snacks/fishmeat = 2,
/datum/reagent/consumable/bbqsauce = 5
)
result = /obj/item/reagent_containers/food/snacks/pizza/flatbread/fish
Expand Down
13 changes: 0 additions & 13 deletions code/modules/jobs/job_types/security_officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
l_pocket = null
r_pocket = null

/datum/outfit/job/security/minutemen/armed
name = "Minuteman (Colonial Minutemen) (Armed)"

suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
belt = /obj/item/storage/belt/military/minutemen/loaded

/datum/outfit/job/security/minutemen/mechpilot
name = "Mech Pilot (Colonial Minutemen)"

Expand All @@ -183,13 +177,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S

backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/restraints/handcuffs=1)

/datum/outfit/job/security/minutemen/bard/armed
name = "Biohazard Removal Specialist (Colonial Minutemen) (Armed)"
suit_store = /obj/item/gun/ballistic/automatic/assualt/p16/minutemen
belt = /obj/item/storage/belt/military/assault/minutemen

backpack_contents = list(/obj/item/flamethrower/full/tank=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1)

/datum/outfit/job/security/inteq
name = "IRMG Enforcer (Inteq)"

Expand Down

0 comments on commit b6ead5c

Please sign in to comment.