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

Overmap Ship normal damage type immunity #2493

Merged
merged 8 commits into from
Aug 25, 2023
Merged

Overmap Ship normal damage type immunity #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbf2793
Funny Damage Resistance
SerynEngi Jul 29, 2023
8187186
missed a comma
SerynEngi Jul 29, 2023
83269ba
commas
SerynEngi Jul 29, 2023
f37f1d7
Requested Changes
SerynEngi Aug 1, 2023
2e5a7be
Reverts changes to attempt to apply a define
SerynEngi Aug 5, 2023
61bccff
Now with Variable OM_ARMOR
SerynEngi Aug 5, 2023
5363a23
Corrected mistake
SerynEngi Aug 14, 2023
41f2132
Refactor to lateinit
Bokkiewokkie Aug 14, 2023
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
2 changes: 2 additions & 0 deletions nsv13/code/__DEFINES/overmap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
#define FIRE_MODE_BROADSIDE 9
#define FIRE_MODE_PHORON 10

//Base Armor Values

#define OM_ARMOR list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 80, "bio" = 100, "rad" = 100, "acid" = 100, "stamina" = 100)

//Deprecated / legacy weapons.

Expand Down
1 change: 1 addition & 0 deletions nsv13/code/modules/overmap/overmap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ Proc to spool up a new Z-level for a player ship and assign it a treadmill.

/obj/structure/overmap/LateInitialize()
. = ..()
armor = armor.setRating(arglist(OM_ARMOR)) //add the default armor values
if(role > NORMAL_OVERMAP)
SSstar_system.add_ship(src)
//reserved_z = src.z //Our "reserved" Z will always be kept for us, no matter what. If we, for example, visit a system that another player is on and then jump away, we are returned to our own Z.
Expand Down
Loading