Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync * sync part 1 - underscore folders in code * controllers folder * datums folder * game folder * cmon, work * modules - admin to awaymissions * cargo to events * fields to lighting * mapping > ruins * rest of the code folder * rest of the folders in the root directory * DME * fixes compiling errors. it compiles so it works * readds map changes * fixes dogborg module select * fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
/datum/round_event_control/high_priority_bounty
|
||||
name = "High Priority Bounty"
|
||||
typepath = /datum/round_event/high_priority_bounty
|
||||
max_occurrences = 3
|
||||
weight = 20
|
||||
earliest_start = 10
|
||||
|
||||
/datum/round_event/high_priority_bounty/announce(fake)
|
||||
priority_announce("Central Command has issued a high-priority cargo bounty. Details have been sent to all bounty consoles.", "Nanotrasen Bounty Program")
|
||||
|
||||
/datum/round_event/high_priority_bounty/start()
|
||||
var/datum/bounty/B
|
||||
for(var/attempts = 0; attempts < 50; ++attempts)
|
||||
B = random_bounty()
|
||||
if(!B)
|
||||
continue
|
||||
B.mark_high_priority(3)
|
||||
if(try_add_bounty(B))
|
||||
break
|
||||
|
||||
@@ -62,6 +62,8 @@
|
||||
temp.update_icon()
|
||||
else if(istype(O, /obj/machinery/door/airlock))
|
||||
var/obj/machinery/door/airlock/temp = O
|
||||
if(temp.critical_machine) //Skip doors in critical positions, such as the SM chamber.
|
||||
continue
|
||||
temp.prison_open()
|
||||
else if(istype(O, /obj/machinery/door_timer))
|
||||
var/obj/machinery/door_timer/temp = O
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
/datum/round_event/vent_clog/setup()
|
||||
endWhen = rand(25, 100)
|
||||
for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
|
||||
if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
|
||||
var/turf/T = get_turf(temp_vent)
|
||||
if(T && is_station_level(T.z) && !temp_vent.welded)
|
||||
vents += temp_vent
|
||||
if(!vents.len)
|
||||
return kill()
|
||||
|
||||
Reference in New Issue
Block a user