Skip to content

Commit

Permalink
new things
Browse files Browse the repository at this point in the history
- UPP Grenade now has less shrapnel but more explosion power, on par with M40 HEDPs
- UPP cargo containers
- Empty onmob suit storage sprites for USCM and UPP service rifles
- Not red gun cabinet
  • Loading branch information
AmoryBlaine committed Aug 22, 2024
1 parent b3cf1dc commit d1f826e
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 14 deletions.
25 changes: 11 additions & 14 deletions code/game/objects/items/explosives/grenades/marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@
explosion_power = 100
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR

/obj/item/explosive/grenade/high_explosive/upp
name = "\improper Type 6 grenade"
desc = "The standard issue fragmentation grenade of the UPP military. It explodes 3 seconds after the pin has been pulled."
icon_state = "grenade_upp"
item_state = "grenade_upp"
throw_speed = SPEED_FAST
throw_range = 6
underslug_launchable = FALSE
explosion_power = 100
shrapnel_count = 48
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR

/*
//================================================
Expand Down Expand Up @@ -116,20 +127,6 @@
shrapnel_count = 48
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR



/obj/item/explosive/grenade/high_explosive/upp
name = "\improper Type 6 shrapnel grenade"
desc = "A fragmentation grenade found within the ranks of the UPP. Designed to explode into shrapnel and rupture the bodies of opponents. It explodes 3 seconds after the pin has been pulled."
icon_state = "grenade_upp"
item_state = "grenade_upp"
throw_speed = SPEED_FAST
throw_range = 6
underslug_launchable = FALSE
explosion_power = 60
shrapnel_count = 56
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR

/*
//================================================
Airburst Grenades
Expand Down
64 changes: 64 additions & 0 deletions code/game/objects/structures/cargo_container.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,70 @@
/obj/structure/cargo_container/seegson/right
icon_state = "seegson_r"

/obj/structure/cargo_container/canc
name = "CANC Cargo Container"
desc = "A huge industrial shipping container.\nThis one is from the Chinese/Asian–Nation Cooperative, which was absorded into the UPP. Their massive industrial output has ensured that cargo containers bearing their symbols and name won't be disappearing any time soon."
/obj/structure/cargo_container/canc/left
icon_state = "canc_g_l"

/obj/structure/cargo_container/canc/mid
icon_state = "canc_g_m"

/obj/structure/cargo_container/canc/right
icon_state = "canc_g_r"

/obj/structure/cargo_container/canc/tan
name = "CANC Cargo Container"
desc = "A huge industrial shipping container.\nThis one is from the Chinese/Asian–Nation Cooperative, which was absorded into the UPP. Their massive industrial output has ensured that cargo containers bearing their symbols and name won't be disappearing any time soon."

/obj/structure/cargo_container/canc/tan/left
icon_state = "canc_t_l"

/obj/structure/cargo_container/canc/tan/mid
icon_state = "canc_t_m"

/obj/structure/cargo_container/canc/tan/right
icon_state = "canc_t_r"

/obj/structure/cargo_container/upp
name = "UPP Cargo Container"
desc = "A huge industrial shipping container.\nThis one is from the Union of Progressive Peoples, as indicated by the massive symbol on the side."

/obj/structure/cargo_container/upp/left
icon_state = "upp_l"

/obj/structure/cargo_container/upp/mid
icon_state = "upp_m"

/obj/structure/cargo_container/upp/right
icon_state = "upp_r"

/obj/structure/cargo_container/upp/tan
name = "UPP Cargo Container"
desc = "A huge industrial shipping container.\nThis one is from the Union of Progressive Peoples, as indicated by the massive symbol on the side."

/obj/structure/cargo_container/upp/tan/left
icon_state = "upp_t_l"

/obj/structure/cargo_container/upp/tan/mid
icon_state = "upp_t_m"

/obj/structure/cargo_container/upp/tan/right
icon_state = "upp_t_r"

/obj/structure/cargo_container/upp/mk6
name = "Ministry of Space Security Cargo Container"
desc = "A huge industrial shipping container.\nThis one belongs to the UPP's Ministry of Space Security."

/obj/structure/cargo_container/upp/mk6/left
icon_state = "mk6_l"

/obj/structure/cargo_container/upp/mk6/mid
icon_state = "mk6_m"

/obj/structure/cargo_container/upp/mk6/right
icon_state = "mk6_r"

/obj/structure/cargo_container/attack_hand(mob/user as mob)

playsound(loc, 'sound/effects/clang.ogg', 25, 1)
Expand Down
Binary file modified icons/mob/humans/onmob/suit_slot.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/contain.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/misc.dmi
Binary file not shown.

0 comments on commit d1f826e

Please sign in to comment.