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

Just some small Galactica tweaks. Nothing to see here. #2579

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Just some small Galactica tweaks. Nothing to see here. #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
917ab9d
revision I
DeltaFire15 Nov 6, 2023
6c1a4ed
revision II
DeltaFire15 Nov 7, 2023
34eafea
post-Revision
DeltaFire15 Nov 7, 2023
1c7cc1d
UI gore
DeltaFire15 Nov 11, 2023
1d73db8
micro UI touch
DeltaFire15 Nov 11, 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
12 changes: 6 additions & 6 deletions _maps/map_files/Galactica/Galactica2.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions code/controllers/subsystem/explosion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ SUBSYSTEM_DEF(explosions)
var/turf/T = locate(epicenter.x, epicenter.y, affecting_z)
if(!T)
continue
if(devastation_range - z_reduction <= 0 && heavy_impact_range - z_reduction <= 0 && light_impact_range - z_reduction <= 0) //NSV13 - explosions still relaying with 0-0-0 can cause REALLY weird behavior.
continue
SSexplosions.explode(T,
max(devastation_range - z_reduction, 0),
max(heavy_impact_range - z_reduction, 0),
Expand Down
2 changes: 1 addition & 1 deletion nsv13.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3845,8 +3845,8 @@
#include "nsv13\code\modules\antagonists\boarders\boarders.dm"
#include "nsv13\code\modules\antagonists\boarders\pirate_boarders.dm"
#include "nsv13\code\modules\atmospherics\gasmixtures\reactions.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\binary_devices\constrictor.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm"
#include "nsv13\code\modules\cargo\mission_rewards.dm"
Expand Down
6 changes: 6 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 @@ -113,3 +113,9 @@ GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace
#define MASS_LARGE 7 //20-40 Players - Medium Capital Ships
#define MASS_TITAN 150 //40+ Players - Large Capital Ships
#define MASS_IMMOBILE 200 //Things that should not be moving. See: stations

//Fun tools
#define SHIELD_NOEFFECT 0 //!Shield failed to absorb hit.
#define SHIELD_ABSORB 1 //!Shield absorbed hit.
#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile with slightly turned vector.
#define SHIELD_FORCE_REFLECT 3 //!Shield absorbed hit and is redirecting projectile in reverse direction.
6 changes: 3 additions & 3 deletions nsv13/code/datums/holocall.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
DELAY 20
PRESET /datum/preset_holoimage/corgi
NAME Burst Data
LANGUAGE /datum/language/eal
LANGUAGE /datum/language/machine
SAY START NTINTEL METADATA
SAY RECORDED 12-17-0000
SAY SECURITY CLASS UNCLASSIFIED
Expand Down Expand Up @@ -320,15 +320,15 @@
DELAY 50
SAY If you need to shut down the reactor, lower the nucleium injection rate slowly. You can cycle coolant in an emergency for a quick cooling boost.
DELAY 50
SAY The reaction can be terminated when the reactor core is under 100 Celsius. Ensure cooling is adequate to achieve this.
SAY The reaction can be terminated when the reactor core is under 200 Celsius. Ensure cooling is adequate to achieve this.
DELAY 50
SAY Finally. If your minimum input power ever starts to converge on the maximum, you are heading towards an emission. Rectify this immediately, or shut down the reactor safely.
DELAY 50
SAY In the event that the Iowa is lost, the Chief Engineer is authorised to destroy the PDSR using the included evidence removal terminal.
DELAY 50
SAY Do your duty. This tape should be destroyed after use. Shield technology does not exist. Glory to Nanotrasen.
NAME Burst Data
LANGUAGE /datum/language/eal
LANGUAGE /datum/language/machine
DELAY 20
SAY START METADATA
SAY RECORDED 5-25-0000
Expand Down
Loading
Loading