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

[MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)

Browse Source 
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-06 22:07:01 +01:00
committed by GitHub
co-authored by Ghilker GoldenAlpharex
parent 5a3b5a4dff
commit cc93b11d23
142 changed files with 1717 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+1 -1
View File
@@ -601,7 +601,7 @@
// Loop over mobs
for(var/t in return_turfs())
var/turf/T = t
for(var/mob/living/M in T.GetAllContents())
for(var/mob/living/M in T.get_all_contents())
// If they have a mind and they're not in the brig, they escaped
if(M.mind && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig))
M.mind.force_escaped = TRUE
code/modules/shuttle/special.dm
+3 -3
View File
@@ -314,17 +314,17 @@
//Here is all the possible paygate payment methods.
var/list/counted_money = list()
for(var/obj/item/coin/C in AM.GetAllContents()) //Coins.
for(var/obj/item/coin/C in AM.get_all_contents()) //Coins.
if(payees[AM] >= threshold)
break
payees[AM] += C.value
counted_money += C
for(var/obj/item/stack/spacecash/S in AM.GetAllContents()) //Paper Cash
for(var/obj/item/stack/spacecash/S in AM.get_all_contents()) //Paper Cash
if(payees[AM] >= threshold)
break
payees[AM] += S.value * S.amount
counted_money += S
for(var/obj/item/holochip/H in AM.GetAllContents()) //Holocredits
for(var/obj/item/holochip/H in AM.get_all_contents()) //Holocredits
if(payees[AM] >= threshold)
break
payees[AM] += H.credits
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
for(var/place in areaInstances)
var/area/shuttle/shuttle_area = place
for(var/turf/shuttle_turf in shuttle_area)
for(var/atom/passenger in shuttle_turf.GetAllContents())
for(var/atom/passenger in shuttle_turf.get_all_contents())
if((is_type_in_typecache(passenger, GLOB.blacklisted_cargo_types) || HAS_TRAIT(passenger, TRAIT_BANNED_FROM_CARGO_SHUTTLE)) && !istype(passenger, /obj/docking_port))
return FALSE
return TRUE