Skip to content

Commit 3ed42a9

Browse files
authored
Endeavour Engines FULL PR (#7106)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Remakes the Endeavour Engines <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game We didn't have engine rotation, now we do, and all functionalities work. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog The conflict isn't real. <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Supermatter Engine add: Better R-UST tweak: Several things in the map /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent 58e5c3e commit 3ed42a9

File tree

12 files changed

+3951
-3206
lines changed

12 files changed

+3951
-3206
lines changed

citadel.dme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4845,6 +4845,7 @@
48454845
#include "code\modules\reagents\machinery\reagent_dispenser\foam.dm"
48464846
#include "code\modules\reagents\machinery\reagent_dispenser\fuel.dm"
48474847
#include "code\modules\reagents\machinery\reagent_dispenser\helium.dm"
4848+
#include "code\modules\reagents\machinery\reagent_dispenser\hydrogen.dm"
48484849
#include "code\modules\reagents\machinery\reagent_dispenser\oil.dm"
48494850
#include "code\modules\reagents\machinery\reagent_dispenser\pepper.dm"
48504851
#include "code\modules\reagents\machinery\reagent_dispenser\virusfood.dm"

code/game/turfs/simulated/flooring/flooring_decals.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,6 +1226,9 @@ var/list/floor_decals = list()
12261226
/obj/effect/floor_decal/corner/navblue/bordercee
12271227
icon_state = "bordercolorcee"
12281228

1229+
/obj/effect/floor_decal/corner/navblue/halfborder
1230+
icon_state = "bordercolorhalf"
1231+
12291232
/obj/effect/floor_decal/corner/navgold
12301233
name = "navgold corner"
12311234
color = COLOR_NAV_GOLD
@@ -1254,6 +1257,8 @@ var/list/floor_decals = list()
12541257
/obj/effect/floor_decal/corner/navgold/bordercee
12551258
icon_state = "bordercolorcee"
12561259

1260+
/obj/effect/floor_decal/corner/navgold/halfborder
1261+
icon_state = "bordercolorhalf"
12571262

12581263
//! ## VR FILE MERGE ## !//
12591264

code/modules/power/engines/rust/fusion_reactions.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ var/list/fusion_reactions
158158
/singleton/fusion_reaction/hydrogen_hydrogen
159159
p_react = "hydrogen"
160160
s_react = "hydrogen"
161-
minimum_energy_level = 117000 //So its actually unobtainable even with the new values I swear if engineering makes me add cold fusion I am going to not touch engineering for at least a month
161+
minimum_reaction_temperature = 40000 //So its actually unobtainable even with the new values I swear if engineering makes me add cold fusion I am going to not touch engineering for at least a month
162162
energy_consumption = 0
163163
energy_production = 20
164164
radiation = 5
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/obj/structure/reagent_dispensers/h
2+
name = "Hydrogen Dispenser"
3+
desc = "A dispenser of hydrogen for fuel."
4+
icon = 'icons/obj/objects.dmi'
5+
icon_state = "acidtank"
6+
amount_per_transfer_from_this = 50
7+
anchored = TRUE
8+
density = FALSE
9+
starting_reagents = list(
10+
/datum/reagent/hydrogen = 10000, // You'll hate me for this but, fuck waiting for medical
11+
)
12+
starting_capacity = 10000

icons/turf/flooring/decals.dmi

422 Bytes
Binary file not shown.

maps/endeavour/engines.dm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
desc = "R-UST Fusion Tokamak Engine"
99
suffix = "rust.dmm"
1010
display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement")
11-
/*
11+
1212
/datum/map_template/engine/endeavour/supermatter
1313
name = "ProcEngine_Endeavour_SME"
1414
desc = "Old Faithful Supermatter"
1515
suffix = "sme.dmm"
16-
display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal")
16+
display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal", "Radioactive Spill")
1717

18+
/*
1819
/datum/map_template/engine/endeavour/burnchamber
1920
name = "ProcEngine_endeavour_Burn"
2021
desc = "Burn Chamber Engine"

0 commit comments

Comments
 (0)