cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 20:17:32 +01:00
committed by GitHub
co-authored by Selis Selis Kashargul SatinIsle Heroman Casey Raeschen
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/xenoarcheaology/tools/ano_device_battery.dm
+6 -6
View File
@@ -103,7 +103,7 @@
if("startup")
if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0))
activated = TRUE
visible_message(span_blue("\icon[src][bicon(src)] [src] whirrs."), span_blue("\icon[src][bicon(src)]You hear something whirr."))
visible_message(span_blue("[icon2html(src,viewers(src))] [src] whirrs."), span_blue("[icon2html(src,viewers(src))]You hear something whirr."))
if(!inserted_battery.battery_effect.activated)
inserted_battery.battery_effect.ToggleActivate(1)
time_end = world.time + duration
@@ -146,9 +146,9 @@
if(interval > 0)
//apply the touch effect to the holder
if(holder)
to_chat(holder, "the \icon[src][bicon(src)] [src] held by [holder] shudders in your grasp.")
to_chat(holder, "the [icon2html(src,holder.client)] [src] held by [holder] shudders in your grasp.")
else
src.loc.visible_message("the \icon[src][bicon(src)] [src] shudders.")
src.loc.visible_message("the [icon2html(src,viewers(src))] [src] shudders.")
//consume power
inserted_battery.use_power(energy_consumed_on_touch)
@@ -175,13 +175,13 @@
//work out if we need to shutdown
if(inserted_battery.stored_charge <= 0)
src.loc.visible_message(span_blue("\icon[src][bicon(src)] [src] buzzes."), span_blue("\icon[src][bicon(src)] You hear something buzz."))
src.loc.visible_message(span_blue("[icon2html(src,viewers(src))] [src] buzzes."), span_blue("[icon2html(src,viewers(src))] You hear something buzz."))
shutdown_emission()
else if(world.time > time_end)
src.loc.visible_message(span_blue("\icon[src][bicon(src)] [src] chimes."), span_blue("\icon[src][bicon(src)] You hear something chime."))
src.loc.visible_message(span_blue("[icon2html(src,viewers(src))] [src] chimes."), span_blue("[icon2html(src,viewers(src))] You hear something chime."))
shutdown_emission()
else
src.visible_message(span_blue("\icon[src][bicon(src)] [src] buzzes."), span_blue("\icon[src][bicon(src)] You hear something buzz."))
src.visible_message(span_blue("[icon2html(src,viewers(src))] [src] buzzes."), span_blue("[icon2html(src,viewers(src))] You hear something buzz."))
shutdown_emission()
last_process = world.time
code/modules/xenoarcheaology/tools/artifact_analyser.dm
+1 -1
View File
@@ -125,7 +125,7 @@
P.name = "[src] report #[++report_num]"
P.info = "<b>[src] analysis report #[report_num]</b><br>"
P.info += "<br>"
P.info += "\icon[scanned_object][bicon(scanned_object)] [results]"
P.info += "[bicon(scanned_object)] [results]"
P.stamped = list(/obj/item/weapon/stamp)
P.add_overlay("paper_stamped")
code/modules/xenoarcheaology/tools/geosample_scanner.dm
+4 -4
View File
@@ -268,16 +268,16 @@
//emergency stop if seal integrity reaches 0
if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield))
stop_scanning()
src.visible_message(span_blue("\icon[src][bicon(src)] buzzes unhappily. It has failed mid-scan!"), 2)
src.visible_message(span_blue("[icon2html(src,viewers(src))] buzzes unhappily. It has failed mid-scan!"), 2)
if(prob(5))
src.visible_message(span_blue("\icon[src][bicon(src)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")]."), 2)
src.visible_message(span_blue("[icon2html(src,viewers(src))] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")]."), 2)
else
//gradually cool down over time
if(scanner_temperature > 0)
scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0)
if(prob(0.75))
src.visible_message(span_blue("\icon[src][bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")]."), 2)
src.visible_message(span_blue("[icon2html(src,viewers(src))] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")]."), 2)
playsound(src, 'sound/effects/ding.ogg', 25)
last_process_worldtime = world.time
@@ -296,7 +296,7 @@
used_coolant = 0
/obj/machinery/radiocarbon_spectrometer/proc/complete_scan()
src.visible_message(span_blue("\icon[src][bicon(src)] makes an insistent chime."), 2)
src.visible_message(span_blue("[icon2html(src,viewers(src))] makes an insistent chime."), 2)
if(scanned_item)
//create report
code/modules/xenoarcheaology/tools/suspension_generator.dm
+4 -4
View File
@@ -150,10 +150,10 @@
for(var/mob/living/M in T)
M.Weaken(5)
M.visible_message(span_blue("[bicon(M)] [M] begins to float in the air!"),"You feel tingly and light, but it is difficult to move.")
M.visible_message(span_blue("[icon2html(M,viewers(M))] [M] begins to float in the air!"),"You feel tingly and light, but it is difficult to move.")
suspension_field = new(T)
visible_message(span_blue("[bicon(src)] [src] activates with a low hum."))
visible_message(span_blue("[icon2html(src,viewers(src))] [src] activates with a low hum."))
icon_state = "suspension_on"
playsound(loc, 'sound/machines/quiet_beep.ogg', 40)
update_icon()
@@ -165,7 +165,7 @@
if(collected)
suspension_field.icon_state = "energynet"
add_overlay("shield2")
visible_message(span_blue("[bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"]."))
visible_message(span_blue("[icon2html(suspension_field,viewers(src))] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"]."))
else
if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall))
suspension_field.icon_state = "shieldsparkles"
@@ -180,7 +180,7 @@
to_chat(M, "<span class='info'>You no longer feel like floating.</span>")
M.Weaken(3)
visible_message(span_blue("[bicon(src)] [src] deactivates with a gentle shudder."))
visible_message(span_blue("[icon2html(src,viewers(src))] [src] deactivates with a gentle shudder."))
qdel(suspension_field)
suspension_field = null
icon_state = "suspension_wrenched"
code/modules/xenoarcheaology/tools/tools.dm
+4 -5
View File
@@ -131,7 +131,7 @@
positive_locations.Add(D)
to_chat(user, "<span class='notice'>\icon[src][bicon(src)] [src] pings.</span>")
to_chat(user, "<span class='notice'>[icon2html(src, user.client)] [src] pings.</span>")
else if(istype(A, /obj/structure/boulder))
var/obj/structure/boulder/B = A
@@ -149,7 +149,7 @@
positive_locations.Add(D)
to_chat(user, "<span class='notice'>\icon[src][bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!</span>")
to_chat(user, "<span class='notice'>[icon2html(src, user.client)] [src] pings [pick("madly","wildly","excitedly","crazily")]!</span>")
/obj/item/device/depth_scanner/attack_self(var/mob/living/user)
tgui_interact(user)
@@ -269,9 +269,9 @@
scan_ticks = 0
var/turf/T = get_turf(src)
if(target_radio)
T.visible_message("\icon[src][bicon(src)] [src] [pick("chirps","chirrups","cheeps")] happily.")
T.visible_message("[icon2html(src,viewers(src))] [src] [pick("chirps","chirrups","cheeps")] happily.")
else
T.visible_message("\icon[src][bicon(src)] [src] [pick("chirps","chirrups","cheeps")] sadly.")
T.visible_message("[icon2html(src,viewers(src))] [src] [pick("chirps","chirrups","cheeps")] sadly.")
else
icon_state = "pinoff"
@@ -352,4 +352,3 @@
set name = "Scan for Anomalies"
set desc = "Scan for artifacts and anomalies within your vicinity."
anomaly_scanner.interact(user)