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

Upp sentry + sentry respirte by amory #191

Merged
merged 8 commits into from
Apr 6, 2024
Merged

Upp sentry + sentry respirte by amory #191

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
80cc754
upp sentry
AndroBetel Mar 28, 2024
08a54ca
amory_resprite
AndroBetel Mar 28, 2024
c3487ec
Update sentry.dm
AndroBetel Mar 28, 2024
681c588
Update code/modules/projectiles/magazines/sentries.dm
FslashN Mar 29, 2024
d344b5f
Update code/modules/projectiles/magazines/sentries.dm
FslashN Mar 29, 2024
f456f80
buffs
AndroBetel Mar 31, 2024
cb28e0e
Update special_ammo.dm
AndroBetel Mar 31, 2024
054d7d6
that was stupid
AndroBetel Apr 3, 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
6 changes: 6 additions & 0 deletions code/datums/ammo/bullet/special_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@
shell_speed = 2*AMMO_SPEED_TIER_6
accuracy = HIT_ACCURACY_TIER_5

/datum/ammo/bullet/turret/upp
damage = 45
penetration = ARMOR_PENETRATION_TIER_2
accuracy_var_low = PROJECTILE_VARIANCE_TIER_2
accuracy_var_high = PROJECTILE_VARIANCE_TIER_2

/datum/ammo/bullet/turret/dumb
icon_state = "bullet"
flags_ammo_behavior = AMMO_BALLISTIC
Expand Down
7 changes: 4 additions & 3 deletions code/modules/defenses/defenses.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name = "Don't see this"
desc = "Call for help."
icon = 'icons/obj/structures/machinery/defenses/sentry.dmi'
icon_state = "defense_base_off"
icon_state = "defense_base"
var/icon_off = "defense_base_off"
anchored = TRUE
unacidable = TRUE
density = TRUE
Expand Down Expand Up @@ -69,9 +70,9 @@
if(!composite_icon)
icon_state = null
else if(turned_on)
icon_state = "defense_base"
icon_state = initial(icon_state)
else
icon_state = "defense_base_off"
icon_state = icon_off


/obj/structure/machinery/defenses/get_examine_text(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/defenses/handheld.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
/obj/item/defenses/handheld/sentry/upp
name = "handheld UPPA 32-H sentry gun"
desc = "A compact version of the UPPA defenses. Designed for quick deployment of the associated type in the field."
icon_state = "UPP uac_sentry_handheld"
defense_type = /obj/structure/machinery/defenses/sentry/upp


// FLAMER BASE AND UPGRADES
/obj/item/defenses/handheld/sentry/flamer
name = "handheld UA 42-F sentry flamer"
Expand Down
7 changes: 7 additions & 0 deletions code/modules/defenses/sentry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,8 @@
/obj/structure/machinery/defenses/sentry/upp
name = "\improper UPPA 32-H sentry gun"
desc = "A deployable, semi-automated turret with AI targeting capabilities. Armed with an AK-500 Autocannon and a 500-round drum magazine."
icon_state = "upp_defense_base"
icon_off = "upp_defense_base_off"
choice_categories = list(
SENTRY_CATEGORY_IFF = list(FACTION_UPP, FACTION_HUMAN),
)
Expand All @@ -770,6 +772,11 @@
SENTRY_CATEGORY_IFF = FACTION_UPP,
)
start_up_message = "Sentry mounted and loaded. Glory to the UPP."
defense_type = "UPP"
handheld_type = /obj/item/defenses/handheld/sentry/upp
fire_delay = 1.2
firing_sound = 'sound/weapons/gun_m56d_auto.ogg'
ammo = new /obj/item/ammo_magazine/sentry/upp

#undef SENTRY_FIREANGLE
#undef SENTRY_RANGE
7 changes: 7 additions & 0 deletions code/modules/projectiles/magazines/sentries.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
/obj/item/ammo_magazine/sentry/premade/dumb
default_ammo = /datum/ammo/bullet/turret/dumb

/obj/item/ammo_magazine/sentry/upp
name = "AK-500 ammo drum (7.62mm Caseless)"
desc = "An ammo drum of 7.62mm caseless rounds for the UPPA 32-H sentry. Just feed it into the sentry gun's ammo port when its ammo is depleted."
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
icon_state = "sentry"
default_ammo = /datum/ammo/bullet/turret/upp

/obj/item/ammo_magazine/sentry/shotgun
name = "12g buckshot drum"
desc = "An ammo drum of 50 12g buckshot drums for the UA 12-G Shotgun Sentry. Just feed it into the sentry gun's ammo port when its ammo is depleted."
Expand Down
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/structures/machinery/defenses/sentry.dmi
View file
Open in desktop
Binary file not shown.
12 changes: 2 additions & 10 deletions maps/map_files/chapaev/chapaev.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,12 +2569,8 @@
/area/golden_arrow/briefing)
"yu" = (
/obj/structure/surface/rack,
/obj/item/ammo_magazine/sentry{
layer = 3.01;
name = "AK-500 ammo drum (7,62mm Caseless)";
desc = "An ammo drum of 500 7,62mm caseless rounds for the UPPA 32-H Sentry Gun. Just feed it into the sentry gun's ammo port when its ammo is depleted."
},
/obj/item/device/motiondetector/hacked,
/obj/item/ammo_magazine/sentry/upp,
/obj/item/defenses/handheld/sentry/upp,
/turf/open/floor/strata{
icon_state = "floor2"
Expand Down Expand Up @@ -3476,12 +3472,8 @@
/area/golden_arrow/hangar)
"GT" = (
/obj/structure/surface/rack,
/obj/item/ammo_magazine/sentry{
layer = 3.01;
name = "AK-500 ammo drum (7,62mm Caseless)";
desc = "An ammo drum of 500 7,62mm caseless rounds for the UPPA 32-H Sentry Gun. Just feed it into the sentry gun's ammo port when its ammo is depleted."
},
/obj/item/device/motiondetector/hacked,
/obj/item/ammo_magazine/sentry/upp,
/obj/item/defenses/handheld/sentry/upp,
/turf/open/floor/strata{
icon_state = "floor2"
Expand Down
Loading