Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

Adjusts the Emag's effect on the Emergency Shuttle #541

Closed

Conversation

etherware-novice
Copy link

About The Pull Request

Adjusts the emag to continuously multiply the shuttle timer, giving crewmembers more than 10 seconds to get on board once an emag is used

Why It's Good For The Game

Makes the emag less broken, especially for hijack missions
Closes #247

Testing Photographs and Procedure

Screenshots&Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
balance: tweaked the emag effect in the escape shuttle
/:cl:

@nednaZ
Copy link
Member

nednaZ commented Jul 12, 2022

Please test that your code runs before setting the pull request to "Open"
Use Draft if you need unit tests.

@etherware-novice
Copy link
Author

sorry! whats a unit test?

@nednaZ
Copy link
Member

nednaZ commented Jul 12, 2022

A unit test is what you see down below, the section saying "All checks have passed"
It confirms that your code can be compiled.

code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
Copy link
Member

@nednaZ nednaZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some issues

code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Show resolved Hide resolved
code/modules/shuttle/emergency.dm Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
Copy link
Member

@nednaZ nednaZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the catgloves changes too

code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
Copy link
Member

@nednaZ nednaZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This currently doesn't even work.
Emagging the shuttle goes straight to the 10 second launch.

ADMIN LOG: Emagged emergency shuttle will launch in 1186 seconds.
SYSTEM ERROR:
The emergency shuttle will launch in 10 seconds

@etherware-novice
Copy link
Author

..what

Copy link
Member

@nednaZ nednaZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost ready

#define EMAG_STAY 1
#define EMAG_SLIGHT 0.6
#define EMAG_HEAVY 0.2
#define EMAG_OHNO 0.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too low.
That takes a 3 minute shuttle to 18 seconds. Might as well just keep the old one.

I'd suggest .25

#define EMAG_DOUBLE 2
#define EMAG_STAY 1
#define EMAG_SLIGHT 0.6
#define EMAG_HEAVY 0.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Takes a 3 minute shuttle to 36 seconds.
I'd suggest .35

code/modules/shuttle/emergency.dm Show resolved Hide resolved
code/modules/shuttle/emergency.dm Outdated Show resolved Hide resolved
etherware-novice and others added 2 commits July 16, 2022 15:13
Co-authored-by: nednaZ <62958508+nednaZ@users.noreply.github.com>

obj_flags |= EMAGGED
SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 20)//YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL
SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 20) //YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was getting compile errors with this comment so added whitespace to be certain

@nednaZ nednaZ closed this Jul 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Emag Override Speed
3 participants