Skip to content

Commit

Permalink
why am I doing this?
Browse files Browse the repository at this point in the history
  • Loading branch information
Zonespace27 committed Mar 17, 2024
1 parent 499d157 commit d23f8e3
Show file tree
Hide file tree
Showing 22 changed files with 75,412 additions and 93 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SUBSYSTEM_DEF(ticker)

var/totalPlayers = 0 //used for pregame stats on statpanel
var/totalPlayersReady = 0 //used for pregame stats on statpanel
var/tutorial_disabled = FALSE //zonenote
var/tutorial_disabled = TRUE

/datum/controller/subsystem/ticker/Initialize(timeofday)
load_mode()
Expand Down
8 changes: 5 additions & 3 deletions code/datums/lazy_template.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@
* Does the grunt work of loading the template.
*/
/datum/lazy_template/proc/lazy_load()
RETURN_TYPE(/datum/turf_reservation)
//RETURN_TYPE(/datum/turf_reservation)
// This is a static assosciative list that is used to ensure maps that have variations are correctly varied when spawned
// I want to make it to where you can make a range and it'll randomly pick'n'take from the available versions at random
// But that can be done later when I have the time
var/static/list/multiple_allocation_hash = list()

//var/static/list/multiple_allocation_hash = list()
return null
/*
var/load_path = "[map_dir]/[map_name].dmm"
if(uses_multiple_allocations)
var/times = multiple_allocation_hash[type] || 0
Expand Down Expand Up @@ -96,3 +97,4 @@
SEND_SIGNAL(src, COMSIG_LAZY_TEMPLATE_LOADED, loaded_atom_movables, loaded_turfs, loaded_areas)
reservations += reservation
return reservation
*/
1 change: 1 addition & 0 deletions code/game/area/areas_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ structure:
icon_state = "metal_dyn_lit"

base_lighting_alpha = 255
ceiling = CEILING_REINFORCED_METAL

//dynamic lighting, lit, unpowered.
/area/event/metal/dynamic/lit/unpowered
Expand Down
19 changes: 2 additions & 17 deletions code/game/gamemodes/colonialmarines/colonialmarines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,23 +249,8 @@
if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_HIJACK_GROUND_CHECK))
return

var/groundside_humans = 0
var/groundside_xenos = 0

for(var/mob/current_mob in GLOB.player_list)
if(!is_ground_level(current_mob.z) || !current_mob.client || current_mob.stat == DEAD)
continue

if(ishuman_strict(current_mob))
groundside_humans++
continue

if(isxeno(current_mob))
groundside_xenos++
continue

if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER))
SSticker.mode.get_specific_call(/datum/emergency_call/forsaken_xenos, TRUE, FALSE) // "Xenomorphs Groundside (Forsaken)"
//if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER))
// SSticker.mode.get_specific_call(/datum/emergency_call/forsaken_xenos, TRUE, FALSE) // "Xenomorphs Groundside (Forsaken)"

TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_GROUND_CHECK, 1 MINUTES)

Expand Down
57 changes: 57 additions & 0 deletions code/game/machinery/computer/computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,60 @@
/obj/structure/machinery/computer/fixer/New()
all_configs = config
..()

/obj/structure/red_terminal
name = "red team terminal"
desc = "Blue team wins if they use this. Don't let that happen."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "power"
color = "#ff0000"
unslashable = TRUE
unacidable = TRUE
indestructible = TRUE

/obj/structure/red_terminal/attack_hand(mob/user)
. = ..()
if(user.faction != FACTION_MARINE)
to_chat(user, SPAN_WARNING("You can't use this."))
return

if(in_use)
return

playsound(src, "keyboard", 15, 1)
in_use = TRUE
if(!do_after(user, 15 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD))
to_chat(user, SPAN_WARNING("You need to finish using the terminal to win."))
in_use = FALSE
return

to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ANNOUNCEMENT_HEADER_ADMIN(" <b>Game Over</b>\n \t Blue team wins. Red team terminal used by [user]."))


/obj/structure/blue_terminal
name = "blue team terminal"
desc = "Red team wins if they use this. Don't let that happen."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "power"
color = "#0000ff"
unslashable = TRUE
unacidable = TRUE
indestructible = TRUE

/obj/structure/blue_terminal/attack_hand(mob/user)
. = ..()
if(user.faction != FACTION_UPP)
to_chat(user, SPAN_WARNING("You can't use this."))
return

if(in_use)
return

playsound(src, "keyboard", 15, 1)
in_use = TRUE
if(!do_after(user, 15 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD))
to_chat(user, SPAN_WARNING("You need to finish using the terminal to win."))
in_use = FALSE
return

to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ANNOUNCEMENT_HEADER_ADMIN(" <b>Game Over</b>\n \t Red team wins. Blue team terminal used by [user]."))
8 changes: 1 addition & 7 deletions code/game/machinery/vending/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
* Returns TRUE if this vending machine is scanning for IDs.
*/
/obj/structure/machinery/vending/proc/checking_id()
if(hacking_safety)
return TRUE

if(isWireCut(VENDING_WIRE_IDSCAN))
return FALSE

return TRUE
return FALSE

/obj/structure/machinery/vending/ui_data(mob/user)
. = list()
Expand Down
5 changes: 3 additions & 2 deletions code/game/objects/items/fulton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ GLOBAL_LIST_EMPTY(deployed_fultons)
var/attachable_atoms = list(/obj/structure/closet/crate)
var/datum/turf_reservation/reservation

/obj/item/stack/fulton/New(loc, amount, atom_to_attach)
..()
/obj/item/stack/fulton/Initialize(loc, amount, atom_to_attach)
. = ..()
if(amount)
src.amount = amount
attached_atom = atom_to_attach
update_icon()
return INITIALIZE_HINT_QDEL

/obj/item/stack/fulton/Destroy()
if(attached_atom)
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/handheld_distress_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
///Tells the user who the beacon will be sent to IC
var/recipient = "the USCSS Royce"
///The name of the ERT that will be passed to get_specific_call
var/list/ert_paths = list(/datum/emergency_call/pmc/chem_retrieval) // "Weyland-Yutani PMC (Chemical Investigation Squad)"
var/list/ert_paths = list() // "Weyland-Yutani PMC (Chemical Investigation Squad)"
///The clickable version that will be sent in message_admins
var/list/ert_short_names = list("SEND PMCs")
///Whether beacon can be used, or has already been used
Expand Down Expand Up @@ -63,7 +63,7 @@
beacon_type = "CMB beacon"
recipient = "Anchorpoint Station"
// "CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)"
ert_paths = list(/datum/emergency_call/cmb/alt, /datum/emergency_call/cmb/anchorpoint)
ert_paths = list()
ert_short_names = list("SEND CMB", "SEND QRF")

// Corporate Lawyer beacon available for 50 points at the CLs briefcase
Expand All @@ -73,7 +73,7 @@

beacon_type = "Lawyer beacon"
recipient = "the Corporate Affairs Division"
ert_paths = list(/datum/emergency_call/inspection_wy/lawyer) // "Lawyers - Corporate"
ert_paths = list() // "Lawyers - Corporate"
ert_short_names = list("SEND LAWYERS")

// Corporate Security Bodyguard beacon available for 50 points at the CLs briefcase
Expand All @@ -83,5 +83,5 @@

beacon_type = "Bodyguard beacon"
recipient = "the Corporate Security Division"
ert_paths = list(/datum/emergency_call/goon/bodyguard) // "Weyland-Yutani Goon (Executive Bodyguard Detail)"
ert_paths = list() // "Weyland-Yutani Goon (Executive Bodyguard Detail)"
ert_short_names = list("SEND BODYGUARD")
4 changes: 2 additions & 2 deletions code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1277,8 +1277,8 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())

/datum/controller/supply/proc/black_market_investigation()
black_market_heat = -1
SSticker.mode.get_specific_call(/datum/emergency_call/inspection_cmb/black_market, TRUE, TRUE) // "Inspection - Colonial Marshals Ledger Investigation Team"
log_game("Black Market Inspection auto-triggered.")
//SSticker.mode.get_specific_call(/datum/emergency_call/inspection_cmb/black_market, TRUE, TRUE) // "Inspection - Colonial Marshals Ledger Investigation Team"
//log_game("Black Market Inspection auto-triggered.")

/obj/structure/machinery/computer/supplycomp/proc/is_buyable(datum/supply_packs/supply_pack)

Expand Down
5 changes: 3 additions & 2 deletions code/modules/admin/topic/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2348,10 +2348,11 @@
/datum/admins/proc/accept_handheld_ert(mob/approver, mob/ref_person, ert_called)
if(GLOB.distress_cancel)
return
GLOB.distress_cancel = TRUE
/*GLOB.distress_cancel = TRUE
SSticker.mode.get_specific_call("[ert_called]", TRUE, FALSE)
log_game("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]")
message_admins("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]")
message_admins("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]")*/
message_admins("ERT calls currently disabled")

/datum/admins/proc/generate_job_ban_list(mob/M, datum/entity/player/P, list/roles, department, color = "ccccff")
var/counter = 0
Expand Down
4 changes: 1 addition & 3 deletions code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
. = ..()
if(!.)
return
if(!SSticker.mode)
to_chat(user, SPAN_WARNING("You can't do this right now!"))
return
return FALSE

/datum/tech/cryomarine/on_unlock()
. = ..()
Expand Down
4 changes: 1 addition & 3 deletions code/modules/cm_tech/techs/marine/tier3/cryorine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
. = ..()
if(!.)
return
if(!SSticker.mode)
to_chat(M, SPAN_WARNING("You can't do this right now!"))
return
return FALSE

/datum/tech/repeatable/cryomarine/on_unlock()
. = ..()
Expand Down
4 changes: 4 additions & 0 deletions code/modules/defenses/handheld.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@
icon_state = "Normal uac_sentry_handheld"
defense_type = /obj/structure/machinery/defenses/sentry

/obj/item/defenses/handheld/sentry/Initialize()
. = ..()
return INITIALIZE_HINT_QDEL

/obj/item/defenses/handheld/sentry/get_upgrade_list()
. = list()
if(!MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_SNIPER_SENTRY))
Expand Down
1 change: 1 addition & 0 deletions code/modules/defenses/sentry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
set_range()
update_icon()
RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(unset_range))
return INITIALIZE_HINT_QDEL

/obj/structure/machinery/defenses/sentry/Destroy() //Clear these for safety's sake.
targets = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
return

if(SSticker.tutorial_disabled)
to_chat(src, SPAN_WARNING("Tutorials are currently disabled because something broke, sorry!"))
to_chat(src, SPAN_WARNING("Tutorials are disabled FOR ONLY THIS ROUND due to performance reasons."))
return

var/datum/tutorial_menu/menu = new(src)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,7 @@ Defined in conflicts.dm of the #defines folder.
name = "S10 variable zoom telescopic scope"
desc = "An ARMAT S10 telescopic eye piece. Can be switched between 2x zoom, which allows the user to move while scoped in, and 4x zoom. Press the 'use rail attachment' HUD icon or use the verb of the same name to zoom."
attachment_action_type = /datum/action/item_action/toggle
ignore_clash_fog = TRUE
var/dynamic_aim_slowdown = SLOWDOWN_ADS_MINISCOPE_DYNAMIC
var/zoom_level = ZOOM_LEVEL_4X

Expand Down Expand Up @@ -1090,6 +1091,7 @@ Defined in conflicts.dm of the #defines folder.
zoom_viewsize = 7
allows_movement = TRUE
aim_speed_mod = 0
ignore_clash_fog = TRUE
var/dynamic_aim_slowdown = SLOWDOWN_ADS_MINISCOPE_DYNAMIC

/obj/item/attachable/scope/mini/New()
Expand Down Expand Up @@ -1160,6 +1162,7 @@ Defined in conflicts.dm of the #defines folder.
zoom_offset = 6
zoom_viewsize = 7
pixel_shift_y = 15
ignore_clash_fog = TRUE
var/dynamic_aim_slowdown = SLOWDOWN_ADS_MINISCOPE_DYNAMIC

/obj/item/attachable/scope/mini_iff/New()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry_properties/prop_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@
H.contract_disease(new /datum/disease/xeno_transformation(0),1) //This is the real reason PMCs are being sent to retrieve it.

/datum/chem_property/special/DNA_Disintegrating/trigger()
SSticker.mode.get_specific_call(/datum/emergency_call/goon/chem_retrieval, TRUE, FALSE, holder.name) // "Weyland-Yutani Goon (Chemical Investigation Squad)"
/*SSticker.mode.get_specific_call(/datum/emergency_call/goon/chem_retrieval, TRUE, FALSE, holder.name) // "Weyland-Yutani Goon (Chemical Investigation Squad)"
GLOB.chemical_data.update_credits(10)
message_admins("The research department has discovered DNA_Disintegrating in [holder.name] adding 10 bonus tech points.")
var/datum/techtree/tree = GET_TREE(TREE_MARINE)
tree.add_points(10)
ai_announcement("NOTICE: Encrypted data transmission received from USCSS Royce. Shuttle inbound.")
ai_announcement("NOTICE: Encrypted data transmission received from USCSS Royce. Shuttle inbound.")*/

/datum/chem_property/special/ciphering
name = PROPERTY_CIPHERING
Expand Down
3 changes: 3 additions & 0 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ endmap

map whiskey_outpost_v2
endmap

map hellway
endmap
39 changes: 39 additions & 0 deletions maps/hellway.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"map_name": "Hellway",
"map_path": "map_files/Hellway",
"map_file": "hellway.dmm",
"survivor_types": [
"/datum/equipment_preset/survivor/scientist/lv",
"/datum/equipment_preset/survivor/doctor/lv",
"/datum/equipment_preset/survivor/chaplain/lv",
"/datum/equipment_preset/survivor/engineer/lv",
"/datum/equipment_preset/survivor/corporate/lv",
"/datum/equipment_preset/survivor/trucker/lv",
"/datum/equipment_preset/survivor/security/lv",
"/datum/equipment_preset/survivor/goon",
"/datum/equipment_preset/survivor/clf",
"/datum/equipment_preset/survivor/civilian"
],
"map_item_type": "/obj/item/map/lazarus_landing_map",
"announce_text": "A distress beacon has been recieved from the space Incredibly Long Hallway. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
"monkey_types": [
"farwa",
"monkey",
"neaera",
"stok"
],
"traits": [{ "Ground": true }],
"xvx_hives": {
"xeno_hive_alpha": 0,
"xeno_hive_bravo": 0,
"xeno_hive_charlie": 70
},
"camouflage": "jungle",
"gamemodes": [
"Distress Signal",
"Hunter Games",
"Hive Wars",
"Faction Clash",
"Infection"
]
}
Loading

0 comments on commit d23f8e3

Please sign in to comment.