cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from NullFag/kill_me

Browse Source 
smexi fix
This commit is contained in:
TemptStation
2022-04-10 14:10:21 -07:00
committed by nullfag
parent a4c5fa6912
commit 9b63431a50
6 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm
View File

@@ -84,7 +84,7 @@
location = "QM #1"
},
/obj/machinery/power/apc{
areastring = "/area/maintenance/starboard";
areastring = "/area/cargo/sorting";
dir = 4;
name = "Starboard Maintenance APC";
pixel_x = 26
@@ -490,13 +490,6 @@
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/quartermaster/sorting";
dir = 1;
name = "Delivery Office APC";
pixel_x = 1;
pixel_y = 24
},
/obj/structure/table/reinforced,
/obj/item/destTagger{
pixel_x = 3;
@@ -2594,7 +2587,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/hallway/secondary/entry";
areastring = "/area/hallway/primary/port";
dir = 4;
name = "Entry Hall APC";
pixel_x = 24
@@ -2717,7 +2710,7 @@
/obj/machinery/disposal/bin,
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/quartermaster/miningdock";
areastring = "/area/cargo/miningdock";
dir = 4;
name = "Mining Dock APC";
pixel_x = 26
@@ -2815,7 +2808,7 @@
},
/obj/machinery/space_heater,
/obj/machinery/power/apc{
areastring = "/area/construction/storage";
areastring = "/area/maintenance/department/electrical";
dir = 8;
name = "Engineering Medical";
pixel_x = -24
@@ -3559,7 +3552,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/storage/atmos";
areastring = "/area/engineering/atmos";
dir = 8;
name = "Atmospherics APC";
pixel_x = -24
@@ -7147,7 +7140,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/maintenance/central";
areastring = "/area/maintenance/department/security";
dir = 1;
name = "Security Maint APC";
pixel_y = 24
@@ -8235,7 +8228,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/captain";
areastring = "/area/command/heads_quarters/captain";
name = "Captain's Office APC";
pixel_y = -26
},
@@ -8644,7 +8637,7 @@
pixel_y = 9
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 1;
name = "RD Office APC";
pixel_y = 25
@@ -8762,7 +8755,7 @@
/area/hallway/secondary/exit/departure_lounge)
"cvH" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/theatre";
areastring = "/area/service/theater";
dir = 1;
name = "Theatre APC";
pixel_y = 24
@@ -12086,7 +12079,7 @@
},
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/power/apc/highcap/fifteen_k{
areastring = "/area/engine/storage";
areastring = "/area/engineering/storage";
dir = 1;
name = "Engineering Secure Storage APC";
pixel_y = 25
@@ -13490,7 +13483,7 @@
/obj/structure/cable,
/obj/machinery/suit_storage_unit/ce,
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/crew_quarters/heads/chief";
areastring = "/area/command/heads_quarters/ce";
name = "CE Office APC";
pixel_y = -24
},
@@ -14649,7 +14642,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/bridge/meeting_room";
areastring = "/area/command/meeting_room";
dir = 1;
name = "Conference Room APC";
pixel_y = 26
@@ -16206,7 +16199,7 @@
},
/obj/effect/turf_decal/tile/red,
/obj/machinery/power/apc{
areastring = "/area/security/main";
areastring = "/area/security";
name = "Security Office APC";
pixel_y = -26
},
@@ -17055,7 +17048,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/kitchen";
areastring = "/area/service/kitchen";
dir = 1;
name = "Kitchen APC";
pixel_y = 24
@@ -20264,7 +20257,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/quartermaster/qm";
areastring = "/area/cargo/qm";
dir = 1;
name = "Quartermaster APC";
pixel_y = 24
@@ -25962,7 +25955,7 @@
/obj/structure/cable,
/obj/structure/closet/toolcloset,
/obj/machinery/power/apc{
areastring = "/area/storage/auxiliary";
areastring = "/area/commons/storage/tools";
name = "Auxiliary Tool Storage APC";
pixel_y = -24
},
@@ -26722,7 +26715,7 @@
dir = 4
},
/obj/machinery/power/apc{
areastring = "/area/engine/atmos";
areastring = "/area/engineering/atmos";
name = "Atmospherics APC";
pixel_y = -24
},
@@ -27535,7 +27528,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 8;
name = "Head of Security's Office APC";
pixel_x = -24
@@ -28838,7 +28831,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/storage/eva";
areastring = "/area/ai_monitored/command/storage/eva";
dir = 1;
name = "EVA Storage APC";
pixel_y = 24
@@ -32503,7 +32496,7 @@
"ndQ" = (
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/quartermaster/storage";
areastring = "/area/cargo/storage";
dir = 4;
name = "Cargo Bay APC";
pixel_x = 24;
@@ -34094,7 +34087,7 @@
/area/security/prison)
"nPn" = (
/obj/machinery/power/apc{
areastring = "/area/chapel/office";
areastring = "/area/service/chapel/office";
dir = 1;
name = "Chapel Office APC";
pixel_y = 24
@@ -34863,7 +34856,7 @@
},
/obj/item/kirbyplants/random,
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/fitness";
areastring = "/area/commons/fitness";
name = "Fitness Room APC";
pixel_y = -24
},
@@ -40131,7 +40124,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/teleporter";
areastring = "/area/command/teleporter";
name = "Teleporter APC";
pixel_y = -24
},
@@ -41225,7 +41218,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/engine/atmospherics_engine";
areastring = "/area/engineering/atmospherics_engine";
dir = 1;
name = "Atmospherics Engine APC";
pixel_y = 25
@@ -47094,7 +47087,7 @@
/area/science/server)
"tzL" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 1;
name = "Head of Personnel APC";
pixel_y = 24
@@ -47733,7 +47726,7 @@
"tOY" = (
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/fitness";
areastring = "/area/commons/fitness";
name = "Fitness Room APC";
pixel_y = -24
},
@@ -49331,7 +49324,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/dorms";
areastring = "/area/commons/dorms";
dir = 1;
name = "Dormitory APC";
pixel_y = 24
@@ -49436,7 +49429,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/bar";
areastring = "/area/service/bar";
dir = 1;
name = "Bar APC";
pixel_y = 23
@@ -50141,7 +50134,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/storage/tech";
areastring = "/area/engineering/storage/tech";
dir = 1;
name = "Tech Storage APC";
pixel_y = 24
@@ -51192,7 +51185,7 @@
},
/obj/machinery/vending/wardrobe/hydro_wardrobe,
/obj/machinery/power/apc{
areastring = "/area/hydroponics";
areastring = "/area/service/hydroponics";
dir = 1;
name = "Hydroponics APC";
pixel_y = 24

5
code/_onclick/hud/radial.dm
View File

@@ -281,6 +281,11 @@ GLOBAL_LIST_EMPTY(radial_menus)
/datum/radial_menu/Destroy()
Reset()
hide()
QDEL_LIST(elements)
QDEL_NULL(close_button)
current_user = null
anchor = null
QDEL_NULL(custom_check_callback)
. = ..()

3
code/game/machinery/quantum_pad.dm
View File

@@ -89,10 +89,11 @@
return ..()
/obj/machinery/quantumpad/interact(mob/user, obj/machinery/quantumpad/target_pad = linked_pad)
if(!target_pad || QDELETED(target_pad))
if(QDELETED(target_pad)) //tempt edit
if(!map_pad_link_id || !initMappedLink())
to_chat(user, "<span class='warning'>Target pad not found!</span>")
return
target_pad = linked_pad //tempt edit
if(world.time < last_teleport + teleport_cooldown)
to_chat(user, "<span class='warning'>[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].</span>")

34
code/game/objects/effects/landmarks.dm
View File

@@ -247,7 +247,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/wizard/Initialize()
..()
GLOB.wizardstart += loc
GLOB.wizardstart += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/start/nukeop
@@ -257,7 +257,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop/Initialize()
..()
GLOB.nukeop_start += loc
GLOB.nukeop_start += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/start/nukeop_leader
@@ -267,7 +267,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop_leader/Initialize()
..()
GLOB.nukeop_leader_start += loc
GLOB.nukeop_leader_start += get_turf(src)
return INITIALIZE_HINT_QDEL
// Must be immediate because players will
@@ -279,7 +279,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/start/new_player/Initialize()
..()
GLOB.newplayer_start += loc
GLOB.newplayer_start += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/start/nuclear_equipment
@@ -309,7 +309,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/latejoin/Initialize(mapload)
..()
SSjob.latejoin_trackers += loc
SSjob.latejoin_trackers += get_turf(src)
return INITIALIZE_HINT_QDEL
// carp.
@@ -334,7 +334,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/xeno_spawn/Initialize(mapload)
..()
GLOB.xeno_spawn += loc
GLOB.xeno_spawn += get_turf(src)
return INITIALIZE_HINT_QDEL
// blobs.
@@ -344,7 +344,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/blobstart/Initialize(mapload)
..()
GLOB.blobstart += loc
GLOB.blobstart += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/secequipment
@@ -353,7 +353,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/secequipment/Initialize(mapload)
..()
GLOB.secequipment += loc
GLOB.secequipment += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/prisonwarp
@@ -362,7 +362,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/prisonwarp/Initialize(mapload)
..()
GLOB.prisonwarp += loc
GLOB.prisonwarp += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/ert_spawn
@@ -371,7 +371,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/ert_spawn/Initialize(mapload)
..()
GLOB.emergencyresponseteamspawn += loc
GLOB.emergencyresponseteamspawn += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/holding_facility
@@ -380,7 +380,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/holding_facility/Initialize(mapload)
..()
GLOB.holdingfacility += loc
GLOB.holdingfacility += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/thunderdome/observe
@@ -389,7 +389,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/thunderdome/observe/Initialize(mapload)
..()
GLOB.tdomeobserve += loc
GLOB.tdomeobserve += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/thunderdome/one
@@ -398,7 +398,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/thunderdome/one/Initialize(mapload)
..()
GLOB.tdome1 += loc
GLOB.tdome1 += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/thunderdome/two
@@ -407,7 +407,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/thunderdome/two/Initialize(mapload)
..()
GLOB.tdome2 += loc
GLOB.tdome2 += get_turf(src)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/thunderdome/admin
@@ -416,7 +416,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/thunderdome/admin/Initialize(mapload)
..()
GLOB.tdomeadmin += loc
GLOB.tdomeadmin += get_turf(src)
return INITIALIZE_HINT_QDEL
//Servant spawn locations
@@ -427,7 +427,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/servant_of_ratvar/Initialize(mapload)
..()
GLOB.servant_spawns += loc
GLOB.servant_spawns += get_turf(src)
return INITIALIZE_HINT_QDEL
//City of Cogs entrances
@@ -437,7 +437,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/city_of_cogs/Initialize(mapload)
..()
GLOB.city_of_cogs_spawns += loc
GLOB.city_of_cogs_spawns += get_turf(src)
return INITIALIZE_HINT_QDEL
//generic event spawns

1
code/game/objects/items/cards_ids.dm
View File

@@ -218,6 +218,7 @@
if(my_store)
my_store.my_card = null
my_store = null
cached_flat_icon = null //tempt edit
return ..()
/obj/item/card/id/vv_edit_var(var_name, var_value)

2
modular_splurt/code/game/machinery/research_table.dm
View File

@@ -85,6 +85,8 @@
return
/obj/machinery/research_table/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
if(QDELETED(buckled_mob) || QDELETED(user)) //tempt edit
return
if(INTERACTING_WITH(buckled_mob, src))
to_chat(user, "<span class='notice'>You're already trying to unbuckle [buckled_mob == user ? "yourself" : buckled_mob]!")
return