cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG Upstream Part 1

Browse Source 
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
This commit is contained in:
Waterpig
2024-10-19 08:04:33 -07:00
committed by Majkl-J
parent 67e8dba34a
commit bb70889f6e
1578 changed files with 384 additions and 52713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm
-8
View File
@@ -14,12 +14,7 @@
baseturfs = /turf/open/water/cursed_spring
planetary_atmos = TRUE
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
<<<<<<< HEAD
/* SKYRAT EDIT REMOVAL
=======
fishing_datum = /datum/fish_source/cursed_spring
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
if(!isliving(arrived))
@@ -44,7 +39,4 @@
var/turf/return_turf = find_safe_turf(extended_safety_checks = TRUE, dense_atoms = FALSE)
transformed_mob.forceMove(return_turf)
to_chat(transformed_mob, span_notice("You blink and find yourself in [get_area_name(return_turf)]."))
<<<<<<< HEAD
*/
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
-4
View File
@@ -161,11 +161,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
/obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user, list/modifiers)
if(!open && !changing_openness)
var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort"))
<<<<<<< HEAD
if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated())
=======
if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
return
user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]..."))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE)
code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
-4
View File
@@ -140,11 +140,7 @@
ui = new(user, src, "VaultController", name)
ui.open()
<<<<<<< HEAD
/obj/machinery/computer/vaultcontroller/ui_act(action, params)
=======
/obj/machinery/computer/vaultcontroller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if(.)
return
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+2 -39
View File
@@ -8,7 +8,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
icon_state = "hilbertshotel"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
<<<<<<< HEAD
//SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE + EXTRA STUFF
var/list/static/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library")
//standart - hilber's hotel room
@@ -21,8 +20,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/map_template/ghost_cafe_rooms/library/ghost_cafe_rooms_library
//Skyrat EDIT END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/datum/map_template/hilbertshotel/hotelRoomTemp
var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty
var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore
@@ -41,7 +38,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
hotelRoomTemp = new()
hotelRoomTempEmpty = new()
hotelRoomTempLore = new()
<<<<<<< HEAD
//SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE
ghost_cafe_rooms_apartment = new()
ghost_cafe_rooms_beach_condo = new()
@@ -49,8 +45,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
ghost_cafe_rooms_library = new()
//SKYRAT EDIT END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/area/currentArea = get_area(src)
if(currentArea.type == /area/ruin/space/has_grav/powered/hilbertresearchfacility/secretroom)
ruinSpawned = TRUE
@@ -97,20 +91,12 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
to_chat(target, span_warning("You too far away from \the [src] to enter it!"))
// If the target is incapacitated after selecting a room, they're not allowed to teleport.
<<<<<<< HEAD
if(target.incapacitated())
if(target.incapacitated)
to_chat(target, span_warning("You aren't able to activate \the [src] anymore!"))
// Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them?
// if(!(get_atom_on_turf(src, /mob) == user)) SKYRAT EDIT ORIGINAL
if(!Adjacent(user)) // SKYRAT EDIT -- Ghost Cafe Static Hilbertspawner
=======
if(target.incapacitated)
to_chat(target, span_warning("You aren't able to activate \the [src] anymore!"))
// Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them?
if(!(get_atom_on_turf(src, /mob) == user))
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
if(user == target)
to_chat(user, span_warning("\The [src] is no longer in your possession!"))
else
@@ -128,14 +114,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
else if(!user.dropItemToGround(src))
to_chat(user, span_warning("You can't seem to drop \the [src]! It must be stuck to your hand somehow! Prepare for unforeseen consequences..."))
<<<<<<< HEAD
//SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE
var/chosen_room = "Nothing"
if(istype(src, /obj/item/hilbertshotel/ghostdojo)) //to don't add another one var
chosen_room = tgui_input_list(user, "Choose desired room:", "Time to choose", hotel_maps)
//SKYRAT EDIT END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
if(!storageTurf) //Blame subsystems for not allowing this to be in Initialize
if(!GLOB.hhStorageTurf)
var/datum/map_template/hilbertshotelstorage/storageTemp = new()
@@ -149,11 +132,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
return
if(tryStoredRoom(chosenRoomNumber, target))
return
<<<<<<< HEAD
sendToNewRoom(chosenRoomNumber, target, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(chosenRoomNumber, target)
=======
sendToNewRoom(chosenRoomNumber, target)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/item/hilbertshotel/proc/tryActiveRoom(roomNumber, mob/user)
if(activeRooms["[roomNumber]"])
@@ -199,24 +178,14 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
return TRUE
return FALSE
<<<<<<< HEAD
/obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(roomNumber, mob/user)
=======
/obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/datum/turf_reservation/roomReservation = SSmapping.request_turf_block_reservation(hotelRoomTemp.width, hotelRoomTemp.height, 1)
var/turf/bottom_left = roomReservation.bottom_left_turfs[1]
var/datum/map_template/load_from = hotelRoomTemp
if(ruinSpawned && roomNumber == GLOB.hhMysteryRoomNumber)
load_from = hotelRoomTempLore
<<<<<<< HEAD
//SKYRAT EDIT ADDITION START - GHOST HOTEL UPDATE
//else if(chosen_room == "Apartment")
// load_from = ghost_cafe_rooms_apartment
//SKYRAT EDIT ADDITION END
//BUBBER EDIT ADDITION START - GHOST HOTEL UPDATE
else if(chosen_room == "Apartment")
load_from = ghost_cafe_rooms_apartment
@@ -227,9 +196,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
load_from = ghost_cafe_rooms_stationside
else if(chosen_room == "Library")
load_from = ghost_cafe_rooms_library
//BUBBER EDIT ADDITION END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
//SKYRAT EDIT ADDITION END
load_from.load(bottom_left)
activeRooms["[roomNumber]"] = roomReservation
@@ -465,13 +432,9 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
has_gravity = TRUE
area_flags = NOTELEPORT | HIDDEN_AREA
static_lighting = TRUE
<<<<<<< HEAD
/* SKYRAT EDIT REMOVAL - GHOST HOTEL UPDATE
ambientsounds = list('sound/ambience/servicebell.ogg')
SKYRAT EDIT END */
=======
ambientsounds = list('sound/ambience/servicebell.ogg')
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/roomnumber = 0
var/obj/item/hilbertshotel/parentSphere
var/datum/turf_reservation/reservation