mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
Merge remote-tracking branch 'Skyrat-SS13/master' into upstream-2024-06-16
# Conflicts: # _maps/_basemap.dm # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/skyrat/automapper/automapper_config.toml # code/__DEFINES/surgery.dm # code/datums/weather/weather_types/radiation_storm.dm # code/modules/antagonists/changeling/changeling.dm # code/modules/clothing/neck/_neck.dm # code/modules/events/_event.dm # code/modules/jobs/job_types/_job.dm # code/modules/mining/equipment/kinetic_crusher.dm # code/modules/mob/living/basic/vermin/frog.dm # modular_skyrat/modules/borgs/code/robot_upgrade.dm
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
|
||||
/// Handles spawning the (new) crate and deleting the former
|
||||
/obj/machinery/quantum_server/proc/generate_loot(obj/cache, obj/machinery/byteforge/chosen_forge)
|
||||
SSblackbox.record_feedback("tally", "bitrunning_domain_primary_completed", 1, generated_domain.key)
|
||||
for(var/mob/person in cache.contents)
|
||||
SEND_SIGNAL(person, COMSIG_BITRUNNER_CACHE_SEVER)
|
||||
|
||||
@@ -47,6 +48,7 @@
|
||||
reward_cache.update_appearance()
|
||||
|
||||
if(can_generate_tech_disk(grade))
|
||||
SSblackbox.record_feedback("tally", "bitrunning_bepis_rewarded", 1, generated_domain.key)
|
||||
new /obj/item/disk/design_disk/bepis/remove_tech(reward_cache)
|
||||
generated_domain.disk_reward_spawned = TRUE
|
||||
|
||||
@@ -54,6 +56,7 @@
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/quantum_server/proc/generate_secondary_loot(obj/curiosity, obj/machinery/byteforge/chosen_forge)
|
||||
SSblackbox.record_feedback("tally", "bitrunning_domain_secondary_completed", 1, generated_domain.key)
|
||||
spark_at_location(curiosity) // abracadabra!
|
||||
qdel(curiosity) // and it's gone!
|
||||
|
||||
|
||||
@@ -51,6 +51,8 @@
|
||||
is_ready = TRUE
|
||||
return FALSE
|
||||
|
||||
SSblackbox.record_feedback("tally", "bitrunning_domain_loaded", 1, map_key)
|
||||
|
||||
is_ready = TRUE
|
||||
|
||||
if(prob(clamp((threat * glitch_chance), 1, 10)))
|
||||
|
||||
Reference in New Issue
Block a user