diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 662310d1f1..a3b4c4f755 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -67,7 +67,6 @@ And see a bag full of dice. Confused, \ you take one... and the bag vanishes.") var/turf/T = get_turf(user) - //SPLURT CHANGE (So long, free wiznerd) | VENUS CHANGE: BROUGHT IT BACK. var/obj/item/dice/d20/fate/one_use/critical_fail = new(T) user.put_in_hands(critical_fail) qdel(src) diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 5636c5cda5..85abbd325f 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -16,14 +16,12 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) var/datum/map_template/hilbertshotel/apartment/bar/hilberts_hotel_rooms_apartment_bar var/datum/map_template/hilbertshotel/apartment/garden/hilberts_hotel_rooms_apartment_garden var/datum/map_template/hilbertshotel/apartment/sauna/hilberts_hotel_rooms_apartment_sauna - //SPLURT EDIT END - //VENUS EDIT START var/datum/map_template/hilbertshotel/apartment/beach/hilberts_hotel_rooms_apartment_beach var/datum/map_template/hilbertshotel/apartment/prison/hilberts_hotel_rooms_apartment_prison var/datum/map_template/hilbertshotel/apartment/winter/hilberts_hotel_rooms_apartment_winter var/datum/map_template/hilbertshotel/apartment/forest/hilberts_hotel_rooms_apartment_forest var/datum/map_template/hilbertshotel/apartment/jungle/hilberts_hotel_rooms_apartment_jungle - //VENUS EDIT END + //SPLURT EDIT END var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore @@ -52,14 +50,12 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) hilberts_hotel_rooms_apartment_bar = new() hilberts_hotel_rooms_apartment_garden = new() hilberts_hotel_rooms_apartment_sauna = new() - //SPLURT EDIT END - //VENUS EDIT START hilberts_hotel_rooms_apartment_beach = new() hilberts_hotel_rooms_apartment_prison = new() hilberts_hotel_rooms_apartment_winter= new() hilberts_hotel_rooms_apartment_forest = new() hilberts_hotel_rooms_apartment_jungle = new() - //VENUS EDIT END + //SPLURT EDIT END var/area/currentArea = get_area(src) if(currentArea.type == /area/ruin/space/has_grav/hilbertresearchfacility) ruinSpawned = TRUE diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 4ae2aa08c4..e5f35eec68 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -398,7 +398,7 @@ return mode = SHUTTLE_DOCKED setTimer(SSshuttle.emergencyDockTime) - // send2adminchat("Server", "The Emergency Shuttle has docked with the station.") + send2adminchat("Server", "The Emergency Shuttle has docked with the station.") priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, "shuttledock", "Priority") ShuttleDBStuff() diff --git a/modular_sand/code/modules/pixel_shift/pixel_shift.dm b/modular_sand/code/modules/pixel_shift/pixel_shift.dm index e0e34bee61..0beb548d04 100644 --- a/modular_sand/code/modules/pixel_shift/pixel_shift.dm +++ b/modular_sand/code/modules/pixel_shift/pixel_shift.dm @@ -6,7 +6,7 @@ var/passthroughable = NONE /datum/keybinding/mob/pixel_shift - hotkey_keys = list("N") + hotkey_keys = list("B") name = "pixel_shift" full_name = "Pixel Shift" description = "Shift your characters offset." diff --git a/modular_splurt/code/modules/discord/toggle_notify.dm b/modular_splurt/code/modules/discord/toggle_notify.dm index d75673592d..b125acdd25 100644 --- a/modular_splurt/code/modules/discord/toggle_notify.dm +++ b/modular_splurt/code/modules/discord/toggle_notify.dm @@ -1,5 +1,4 @@ // Verb to toggle restart notifications -/* /client/verb/notify_restart() set category = "OOC" set name = "Notify Restart" @@ -33,5 +32,3 @@ // If we got here, they arent in the list. Chuck 'em in! to_chat(src, span_notice("You will now be notified when the server restarts")) SSdiscord.notify_members += "<@[stored_id]>" // The list uses strings because BYOND cannot handle a 17 digit integer - -*/