Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Interim Removal Of CLF Special Gear #460

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
+4 −46
Open

Interim Removal Of CLF Special Gear #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
115e852
done
KoishiVibe Jun 13, 2024
f0b4d03
fucking fix you piece of shit
Jun 20, 2024
017baf3
undoes a fuckup with the master
Jun 22, 2024
3be565c
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 22, 2024
9698a01
fixes issue
Jun 22, 2024
c040c59
how tf did this get changed
KoishiVibe Jun 25, 2024
d681f97
flask draftoid
KoishiVibe Aug 13, 2024
71341c8
mre obliteration
KoishiVibe Aug 13, 2024
fe00da5
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 14, 2024
6cd3f94
decommits stuff
Aug 15, 2024
fc4270d
fucking fix you pice of shit
Aug 15, 2024
df9e105
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 20, 2024
ab2a3a0
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 25, 2024
d4766cc
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Aug 27, 2024
5e31559
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 28, 2024
8e66c08
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Sep 5, 2024
26d5104
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Sep 16, 2024
6e57e84
removes incend b/s and molotovs from starter
Sep 18, 2024
8f0087e
vendors
Sep 18, 2024
44c64f4
Merge branch 'master' into inter-rim
KoishiVibe Sep 19, 2024
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
17 changes: 4 additions & 13 deletions code/modules/gear_presets/_select_equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,8 @@ GLOBAL_LIST_EMPTY(personal_closets)

var/list/rebel_firearms = list(
/obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/flechette,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
Expand Down Expand Up @@ -536,9 +534,6 @@ GLOBAL_LIST_EMPTY(personal_closets)
/obj/item/attachable/bayonet/upp = null,
/obj/item/explosive/grenade/custom/ied = null,
/obj/item/explosive/grenade/custom/ied = null,
/obj/item/explosive/grenade/custom/ied_incendiary = null,
/obj/item/reagent_container/spray/pepper = null,
/obj/item/reagent_container/spray/pepper = null,
/obj/item/clothing/accessory/storage/webbing = null,
/obj/item/clothing/accessory/storage/webbing = null,
/obj/item/storage/belt/marine = null,
Expand All @@ -560,12 +555,10 @@ GLOBAL_LIST_EMPTY(personal_closets)
/obj/item/explosive/grenade/smokebomb = null,
/obj/item/explosive/grenade/smokebomb = null,
/obj/item/explosive/grenade/smokebomb = null,
/obj/item/explosive/grenade/phosphorus/upp = null,
/obj/item/tool/hatchet = null,
/obj/item/tool/hatchet = null,
/obj/item/tool/hatchet = null,
/obj/item/storage/box/MRE = null,
/obj/item/clothing/glasses/night/m42_night_goggles/upp = null,
/obj/item/storage/box/handcuffs = null,
/obj/item/storage/pill_bottle/happy = null,
/obj/item/weapon/twohanded/fireaxe = null,
Expand Down Expand Up @@ -598,10 +591,8 @@ GLOBAL_LIST_EMPTY(personal_closets)

GLOBAL_LIST_INIT(rebel_shotguns, list(
/obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/flechette,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/buckshot
))

Expand Down
33 changes: 0 additions & 33 deletions code/modules/gear_presets/clf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,11 @@
list("Sandbags x25", 5, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down Expand Up @@ -182,7 +177,6 @@
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/low_grade_full, WEAR_L_STORE)
Expand Down Expand Up @@ -255,16 +249,11 @@
list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down Expand Up @@ -413,16 +402,11 @@
list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down Expand Up @@ -538,15 +522,11 @@

list("SPECIAL AMMUNITION", 0, null, null, null),
list("Mk70 Ammo Box (7.62x51mm)", 15, /obj/item/ammo_magazine/m60, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),
list("SVD Magazine (7.62x54mmR)", 15, /obj/item/ammo_magazine/sniper/svd, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down Expand Up @@ -588,8 +568,6 @@

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver(new_human), WEAR_IN_BACK)
Expand Down Expand Up @@ -684,16 +662,10 @@
list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down Expand Up @@ -1062,16 +1034,11 @@
list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
Expand Down
Loading