Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kocma-san committed Dec 22, 2024
1 parent d718aab commit 017992e
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,12 @@
name = "Random Pizza Box"
item_path = /obj/item/pizzabox/random

// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219
/*
/datum/loadout_item/pocket_items/medkit
name = "First-Aid Kit"
item_path = /obj/item/storage/medkit/regular
*/

/datum/loadout_item/pocket_items/medipen_pouch
name = "Empty Colonial Medipen Pouch"
Expand All @@ -235,6 +238,8 @@
name = "Empty Colonial First Aid Pouch"
item_path = /obj/item/storage/pouch/cin_medkit

// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219
/*
/datum/loadout_item/pocket_items/deforest_cheesekit
name = "Civil Defense Medical Kit"
item_path = /obj/item/storage/medkit/civil_defense/stocked
Expand All @@ -246,6 +251,7 @@
/datum/loadout_item/pocket_items/synthetic_medkit
name = "Robotic Repair Equipment Kit"
item_path = /obj/item/storage/medkit/robotic_repair/stocked
*/

/datum/loadout_item/pocket_items/ingredients
name = "Wildcard Ingredient Box"
Expand Down
27 changes: 27 additions & 0 deletions tff_modular/modules/cargo/goodies.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Изменение цен для заказов карго вот этих вот -> 'code\modules\cargo\goodies.dm'

/datum/supply_pack/goody/firstaidbruises_single
cost = PAYCHECK_CREW * 6

/datum/supply_pack/goody/firstaidburns_single
cost = PAYCHECK_CREW * 6

/datum/supply_pack/goody/firstaid_single
cost = PAYCHECK_CREW * 4

/datum/supply_pack/goody/firstaidoxygen_single
cost = PAYCHECK_CREW * 6

/datum/supply_pack/goody/firstaidtoxins_single
cost = PAYCHECK_CREW * 6

/datum/supply_pack/goody/bandagebox_singlepack

/datum/supply_pack/goody/medipen_twopak


// Изменение цен для заказов карго вот этих вот -> 'modular_nova\modules\cargo\code\goodies.dm'

/datum/supply_pack/goody/firstaid_pouch

/datum/supply_pack/goody/stabilizer_pouch
18 changes: 0 additions & 18 deletions tff_modular/modules/loadout/code/medkits/medkits.dm

This file was deleted.

2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8838,6 +8838,7 @@
#include "tff_modular\modules\bunny\code\clothing\neck.dm"
#include "tff_modular\modules\bunny\code\clothing\suit.dm"
#include "tff_modular\modules\bunny\code\clothing\under.dm"
#include "tff_modular\modules\cargo\goodies.dm"
#include "tff_modular\modules\character_directory\character_directory.dm"
#include "tff_modular\modules\clothing\backpack\backpack.dm"
#include "tff_modular\modules\clothing\suit\suit.dm"
Expand Down Expand Up @@ -8875,7 +8876,6 @@
#include "tff_modular\modules\loadout\code\clothing\grayscale.dm"
#include "tff_modular\modules\loadout\code\clothing\neck.dm"
#include "tff_modular\modules\loadout\code\loadout\neck.dm"
#include "tff_modular\modules\loadout\code\medkits\medkits.dm"
#include "tff_modular\modules\martial\sleeping_carp.dm"
#include "tff_modular\modules\modular_automapper\automapper.dm"
#include "tff_modular\modules\modular_automapper\replacer.dm"
Expand Down

0 comments on commit 017992e

Please sign in to comment.