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

Cas weaponry doesn't fit on other shuttles now. #566

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cas weaponry doesn't fit on other shuttles now. #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308d765
move defines
Helg2 Oct 18, 2024
f8419cc
cas weaponry doesn't fit other shuttles
Helg2 Oct 18, 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
7 changes: 7 additions & 0 deletions code/__DEFINES/objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,13 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
#define DROPPOD_ACTIVE 2
#define DROPPOD_LANDED 3

#define DROPSHIP_WEAPON "dropship_weapon"
#define DROPSHIP_WEAPON_CAS "dropship_weapon_cas"
#define DROPSHIP_CREW_WEAPON "dropship_crew_weapon"
#define DROPSHIP_ELECTRONICS "dropship_electronics"
#define DROPSHIP_FUEL_EQP "dropship_fuel_equipment"
#define DROPSHIP_COMPUTER "dropship_computer"

///Burn level applied by lava if it calls fire_act
#define LAVA_BURN_LEVEL 60

Expand Down
14 changes: 2 additions & 12 deletions code/game/objects/structures/dropship_equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@

#define DROPSHIP_WEAPON "dropship_weapon"
#define DROPSHIP_CREW_WEAPON "dropship_crew_weapon"
#define DROPSHIP_ELECTRONICS "dropship_electronics"
#define DROPSHIP_FUEL_EQP "dropship_fuel_equipment"
#define DROPSHIP_COMPUTER "dropship_computer"


//the bases onto which you attach dropship equipments.

/obj/effect/attach_point
name = "equipment attach point"
desc = "A place where heavy equipment can be installed with a powerloader."
Expand Down Expand Up @@ -71,7 +61,6 @@

loaded_equipment.update_equipment()


/obj/effect/attach_point/weapon
name = "weapon system attach point"
icon_state = "equip_base_front"
Expand All @@ -87,6 +76,7 @@

/obj/effect/attach_point/weapon/cas
ship_tag = SHUTTLE_CAS_DOCK
base_category = DROPSHIP_WEAPON_CAS
icon = 'icons/Marine/casship.dmi'
icon_state = "15"

Expand Down Expand Up @@ -637,7 +627,7 @@
/obj/structure/dropship_equipment/cas/weapon
name = "abstract weapon"
icon = 'icons/Marine/mainship_props64.dmi'
equip_category = DROPSHIP_WEAPON
equip_category = DROPSHIP_WEAPON_CAS
bound_width = 32
bound_height = 64
dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE|FIRE_MISSION_ONLY
Expand Down
Loading