diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm index b09c26ffb92f..4a353d5ed5c5 100644 --- a/code/_onclick/human.dm +++ b/code/_onclick/human.dm @@ -38,7 +38,7 @@ if (A != src) return ..() var/mob/living/carbon/human/H = A - if (last_chew + 75 > world.time) + if (last_chew + 1 > world.time) to_chat(H, SPAN_DANGER("You can't bite your hand again yet...")) return diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index 8939b80e52d6..f7802089cbfe 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -1,13 +1,3 @@ -/datum/supply_packs/m56b_smartgun - name = "M56B Smartgun System Package (x1)" - contains = list( - /obj/item/storage/box/m56_system, - ) - cost = 100 - containertype = /obj/structure/closet/crate/weapon - containername = "M56B Smartgun System Package" - group = "Weapons" - /datum/supply_packs/m56_hmg name = "M56D Heavy Machine Gun (x1)" contains = list( diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 53ce7986f195..74a3d2a6167b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 18, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), @@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Engineer kit Pouch", 0, /obj/item/storage/pouch/engikit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index d3985adf5fab..0055dc2b1375 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 917bf2850997..a8cc8be64bda 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 75e7fc36e4d3..1db378bd1d98 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 15, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 15, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index bedffdec7f90..962580529eb2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 8bd46110aba5..a4535fc7bfb4 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index 44729ac16b2f..c55e1d054b79 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -11,6 +11,7 @@ specialty = "M45 pattern ghillie" valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + unacidable = TRUE var/camo_active = FALSE var/hide_in_progress = FALSE diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index f52956edd97d..64cf88d22cfe 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -9,6 +9,7 @@ storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + unacidable = TRUE allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, diff --git a/code/modules/cm_marines/equipment/weapons.dm b/code/modules/cm_marines/equipment/weapons.dm index 9a84c84125d5..085289cd3cbf 100644 --- a/code/modules/cm_marines/equipment/weapons.dm +++ b/code/modules/cm_marines/equipment/weapons.dm @@ -12,10 +12,10 @@ /obj/item/storage/box/m56_system/Initialize() . = ..() - new /obj/item/clothing/glasses/night/m56_goggles(src) + new /obj/item/clothing/suit/storage/marine/smartgunner(src) new /obj/item/weapon/gun/smartgun(src) + new /obj/item/clothing/glasses/night/m56_goggles(src) new /obj/item/smartgun_battery(src) - new /obj/item/clothing/suit/storage/marine/smartgunner(src) for(var/i in 1 to 3) new /obj/item/ammo_magazine/smartgun(src) update_icon() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm deleted file mode 100644 index c3d4698fbc03..000000000000 --- a/code/modules/power/gravitygenerator.dm +++ /dev/null @@ -1,23 +0,0 @@ -// It... uses a lot of power. Everything under power is engineering stuff, at least. - -/obj/structure/machinery/computer/gravity_control_computer - name = "Gravity Generator Control" - desc = "A computer to control a local gravity generator. Qualified personnel only." - icon = 'icons/obj/structures/machinery/computer.dmi' - icon_state = "gravitycomp" - anchored = TRUE - density = TRUE - var/obj/structure/machinery/gravity_generator = null - - -/obj/structure/machinery/gravity_generator - name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." - icon = 'icons/obj/structures/props/singularity.dmi' - icon_state = "TheSingGen" - anchored = TRUE - density = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 200 - active_power_usage = 1000 - var/on = 1 diff --git a/colonialmarines.dme b/colonialmarines.dme index a5109c8dd48a..8374bb19415a 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2192,7 +2192,6 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" -#include "code\modules\power\gravitygenerator.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\port_gen.dm" #include "code\modules\power\power.dm" diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index afb87c91ce88..dd7e9fc7ba82 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -179,3 +179,16 @@ are replaced with upgraded APC variant containing high capacity cell, weak variant got replaced with normal APC variant. - bugfix: Fixes APC's with wrong offsets (strata and Prison) +2024-08-10: + BasilHerb: + - rscdel: removed the M56B Smartgun Kit from requisitions. + - balance: made the M56 Combat Harness unmeltable. + - balance: made the M45 Ghillie Suit unmeltable. + Contrabang: + - qol: Reorders the Essential SG Kit in order of Armor, Smartgun, Goggles + HaultyAnonie: + - bugfix: Made claymore boxes in vendors be accurately labeled as the amount of + claymores they contain. From (x4 mines) to (x5 mines). The actual contents of + the box. + cuberound: + - rscdel: removes gravity generator (ugly legacy stuff) diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 42c903cab227..59f0a59d6ca5 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -40319,12 +40319,6 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/engineering/atmos) "qVd" = ( -/obj/structure/machinery/gravity_generator{ - desc = "Absorbs and redirects radiation, hopefully away from you."; - name = "Radiation Collector"; - pixel_x = 15; - pixel_y = -5 - }, /obj/structure/platform{ dir = 1 }, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 70bfb5c2914b..6247c6ce1347 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -828,7 +828,8 @@ /turf/open/shuttle/predship, /area/yautja) "co" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/machinery/portable_atmospherics/canister/phoron, +/obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, @@ -934,7 +935,8 @@ /turf/open/floor/corsat/squareswood/north, /area/yautja) "cy" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/window/phoronreinforced, +/obj/structure/machinery/portable_atmospherics/canister/phoron, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" },