Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 9db2f06

Browse files
Scrambledeggs00Scrambledeggs00
authored
Fuck you *Ungreens your Peacekeepers* (#20053)
* Sprites Part 1: I hate transparency * Sprites Part 2: Electric Booogaloo * lack of transparency fixed * More sprite fixes * Tacmask and sprites * Tacprod inactive and nocell sprites * Tacprod Animation Part 1: Bugs galore * Tacprod Animation Part 2: Tacmask revengance * white beret
1 parent 774e2af commit 9db2f06

22 files changed

Lines changed: 55 additions & 20 deletions

File tree

‎code/game/objects/items/stunbaton.dm‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,18 @@
293293
/obj/item/melee/baton/cattleprod/tactical
294294
name = "tactical stunprod"
295295
desc = "A cost-effective, mass-produced, tactical stun prod."
296+
icon_state = "tacprod"
297+
item_state = "tacprod"
296298
preload_cell_type = /obj/item/stock_parts/cell/high/plus // comes with a cell
297-
color = "#aeb08c" // super tactical
299+
300+
/obj/item/melee/baton/cattleprod/tactical/update_icon_state()
301+
. = ..()
302+
if(status)
303+
item_state = "[initial(item_state)]_active"
304+
else if(!cell)
305+
item_state = "[initial(item_state)]_nocell"
306+
else
307+
item_state = "[initial(item_state)]"
298308

299309
/obj/item/batonupgrade
300310
name = "baton power upgrade"

‎code/modules/clothing/head/helmet.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
/obj/item/clothing/head/helmet/sec/occupying
9494
name = "occupying force helmet"
9595
desc = "Standard deployment gear. Protects the head from impacts and has a built in mounted light."
96+
icon_state = "occhelm"
97+
item_state = "occhelm"
9698

9799
/obj/item/clothing/head/helmet/sec/occupying/Initialize(mapload, mob/user)
98100
attached_light = new /obj/item/flashlight/seclite(null)

‎code/modules/clothing/masks/breath.dm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
/obj/item/clothing/mask/breath/tactical
1919
name = "tactical breath mask"
20-
desc = "A close-fitting 'tactical' mask that can be connected to an air supply. This model is not translucent for anonymity."
21-
color = "#736e35"
20+
desc = "A close-fitting 'tactical' mask that can be connected to an air supply."
21+
icon_state = "tacmask"
22+
item_state = "sechailer"
2223
visor_flags_inv = HIDEFACE
2324

2425
/obj/item/clothing/mask/breath/tactical/Initialize(mapload)

‎code/modules/clothing/outfits/occupying.dm‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Peacekeeping force clothing
22
/obj/item/clothing/under/rank/security/grey/amber/occupying
3-
name = "peacekeeping force jumpsuit"
4-
color = "#55ff9b"
3+
name = "peacekeeping officer jumpsuit"
4+
desc = "A Peacekeeper uniform with red marking denoting officers and heavies."
5+
icon_state = "occuniformofficer"
6+
item_state = "occuniformofficer"
7+
8+
/obj/item/clothing/under/rank/security/grey/amber/occupying/commander
9+
name = "peacekeeping commander jumpsuit"
10+
desc = "A Peacekeeper uniform with blue markings denoting commanders"
11+
icon_state = "occuniformcommander"
12+
item_state = "occuniformcommander"
513

614
/obj/item/clothing/under/rank/security/grey/amber/occupying/Initialize(mapload, mob/user)
715
. = ..()
@@ -10,23 +18,38 @@
1018

1119
/obj/item/clothing/head/beret/sec/centcom/occupying
1220
name = "peacekeeping force beret"
13-
desc = "A special green beret for the mundane life of an Peacekeeper force commander."
14-
color = "#55ff9b"
21+
desc = "A special white beret for the mundane life of a Peacekeeper force commander."
22+
icon_state = "occberet"
23+
item_state = "occberet"
24+
25+
/obj/item/clothing/suit/armor/vest/alt/occupying
26+
name = "peacekeeping force vest"
27+
desc = "A blue armored vest worn by Peacekeeper officers."
28+
icon_state = "occvest"
29+
item_state = "occvest"
1530

1631
/obj/item/clothing/suit/armor/riot/occupying
1732
armor = list(MELEE = 40, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 40, ACID = 40)
1833
name = "peacekeeping force riot suit"
19-
desc = "A mass produced semi-flexible polycarbonate body armor with decent padding to protect against melee attacks. Not as strong as riot suits typically issued to NT stations."
20-
color = "#55ff9b"
34+
desc = "A reinforced version of the standard Peacekeeper vest with extra padding to protect against melee attacks. Not as strong as riot suits typically issued to NT stations."
35+
icon_state = "occriotsuit"
36+
item_state = "occriotsuit"
2137

2238
/obj/item/clothing/head/helmet/riot/raised/occupying
2339
name = "peacekeeping force riot helmet"
24-
desc = "It's a helmet specifically designed for the Peacekeeping force to protect against close range attacks."
25-
color = "#55ff9b"
40+
desc = "A blue helmet specifically designed for the Peacekeeping force to protect against close range attacks."
41+
icon_state = "occriothelm"
42+
item_state = "occriothelm"
43+
44+
/obj/item/storage/belt/military/occbelt
45+
name = "peacekeeping force belt"
46+
desc = "A blue belt used by Peacekeepers to store their gear."
47+
icon_state = "occbelt"
48+
item_state = "occbelt"
2649

2750
// Peacekeeping force vest loadouts
2851
// To note: each vest has 7 normal slots - Hopek
29-
/obj/item/storage/belt/military/occupying_officer/Initialize(mapload) // Occupying Officer
52+
/obj/item/storage/belt/military/occbelt/occupying_officer/Initialize(mapload) // Occupying Officer
3053
. = ..()
3154
new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
3255
new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
@@ -37,7 +60,7 @@
3760
new /obj/item/jawsoflife/jimmy(src)
3861

3962

40-
/obj/item/storage/belt/military/occupying_commander/Initialize(mapload) // Occupying force Commander
63+
/obj/item/storage/belt/military/occbelt/occupying_commander/Initialize(mapload) // Occupying force Commander
4164
. = ..()
4265
new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
4366
new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
@@ -47,10 +70,8 @@
4770
new /obj/item/restraints/handcuffs/cable/zipties(src)
4871
new /obj/item/jawsoflife/jimmy(src)
4972

50-
/obj/item/storage/belt/military/occupying_heavy
51-
color = "#55ff9b"
5273

53-
/obj/item/storage/belt/military/occupying_heavy/Initialize(mapload) // Occupying Riot Officer
74+
/obj/item/storage/belt/military/occbelt/occupying_heavy/Initialize(mapload) // Occupying Riot Officer
5475
. = ..()
5576
new /obj/item/restraints/legcuffs/bola/energy(src)
5677
new /obj/item/restraints/legcuffs/bola/energy(src)
@@ -64,12 +85,12 @@
6485
/datum/outfit/occupying
6586
name = "Peacekeeping Officer"
6687
uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying
67-
suit = /obj/item/clothing/suit/armor/vest/alt
88+
suit = /obj/item/clothing/suit/armor/vest/alt/occupying
6889
shoes = /obj/item/clothing/shoes/jackboots
6990
gloves = /obj/item/clothing/gloves/color/black
7091
ears = /obj/item/radio/headset/headset_cent/alt
7192
mask = /obj/item/clothing/mask/cigarette/lit
72-
belt = /obj/item/storage/belt/military/occupying_officer
93+
belt = /obj/item/storage/belt/military/occbelt/occupying_officer
7394
suit_store = /obj/item/gun/ballistic/automatic/wt550/armory
7495
back = /obj/item/melee/baton/cattleprod/tactical
7596
head = /obj/item/clothing/head/helmet/sec/occupying
@@ -102,16 +123,17 @@
102123

103124
/datum/outfit/occupying/commander
104125
name = "Peacekeeping force Commander"
126+
uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying/commander
105127
head = /obj/item/clothing/head/beret/sec/centcom/occupying
106-
belt = /obj/item/storage/belt/military/occupying_commander
128+
belt = /obj/item/storage/belt/military/occbelt/occupying_commander
107129
l_pocket = /obj/item/pinpointer/nuke
108130
r_pocket = /obj/item/lighter/greyscale // everyone has ciggies, only commander has a lighter
109131
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
110132
glasses = /obj/item/clothing/glasses/hud/security
111133

112134
/datum/outfit/occupying/heavy
113135
name = "Peacekeeping Riot Officer"
114-
belt = /obj/item/storage/belt/military/occupying_heavy
136+
belt = /obj/item/storage/belt/military/occbelt/occupying_heavy
115137
back = /obj/item/shield/riot
116138
l_pocket = /obj/item/clothing/ears/earmuffs
117139
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi

‎icons/mob/clothing/back.dmi‎

-5.7 KB
Binary file not shown.

‎icons/mob/clothing/belt.dmi‎

2 Bytes
Binary file not shown.

‎icons/mob/clothing/head/head.dmi‎

622 Bytes
Binary file not shown.

‎icons/mob/clothing/mask/mask.dmi‎

-3.56 KB
Binary file not shown.

‎icons/mob/clothing/suit/suit.dmi‎

-44.7 KB
Binary file not shown.

‎icons/mob/clothing/uniform/uniform.dmi‎

2.88 KB
Binary file not shown.

0 commit comments

Comments
 (0)