Skip to content

Commit

Permalink
Fixes new runtimes
Browse files Browse the repository at this point in the history
Fixes rogue vent on the map
Fixes issues with areas and accesses not being added to lists
  • Loading branch information
Alek2ander committed Oct 29, 2014
1 parent d19500d commit 47eaae1
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 23 deletions.
19 changes: 10 additions & 9 deletions _maps/map_files/tgstation.2.1.3.dmm

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion code/game/area/Space Station 13 areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1819,10 +1819,14 @@ var/list/the_station_areas = list (
/area/toxins,
/area/storage,
/area/construction,
/area/tcommsat,
/area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0
/area/ai_monitored/storage/satellite,
/area/ai_monitored/nuke_storage,
/area/ai_monitored/security/armory,
// /area/ai_monitored/storage/secure, //not present on map
// /area/ai_monitored/storage/emergency, //not present on map
/area/turret_protected/ai_upload, //do not try to simplify to "/area/turret_protected" --rastaf0
/area/turret_protected/ai_upload_foyer,
/area/turret_protected/ai,
/area/turret_protected/ai
)
7 changes: 5 additions & 2 deletions code/game/gamemodes/gameticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,11 @@ var/round_start_time = 0
player.create_character()
qdel(player)
else
if(player.client && player.client.prefs && player.client.prefs.agree)
player.new_player_panel()
if(player.client)
if(player.client.prefs.agree < MAXAGREE)
player.disclaimer()
else
player.new_player_panel()


/datum/controller/gameticker/proc/collect_minds()
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,8 @@
return "Weapon Permit"
if(access_counter)
return "Bar Counter"
if(access_paramedic)
return "Paramedic Room"

/proc/get_centcom_access_desc(A)
switch(A)
Expand Down
10 changes: 5 additions & 5 deletions code/game/jobs/job/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ Chef
department_head = list("Head of Personnel")
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
spawn_positions = 1
total_positions = 2
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#dddddd"

Expand Down Expand Up @@ -223,7 +223,7 @@ Cargo Technician
department_head = list("Head of Personnel")
department_flag = CIVILIAN
faction = "Station"
total_positions = 3
total_positions = 4
spawn_positions = 2
supervisors = "the quartermaster and the head of personnel"
selection_color = "#dddddd"
Expand Down Expand Up @@ -392,8 +392,8 @@ Librarian
department_head = list("Head of Personnel")
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
spawn_positions = 1
total_positions = 2
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#dddddd"
minimal_player_age = 5
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/Sleeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@

/obj/machinery/sleeper/open_machine()
if(!state_open && !panel_open)
..()
..(0)

/obj/machinery/sleeper/close_machine(mob/target)
if(state_open && !panel_open)
..(target)
..(target, 0)

/obj/machinery/sleeper/proc/inject_chem(mob/user, chem)
if(occupant && occupant.reagents)
Expand Down
10 changes: 6 additions & 4 deletions code/game/machinery/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Class Procs:
pulse2.delete()
..()

/obj/machinery/proc/open_machine()
/obj/machinery/proc/open_machine(updateDialog = 1)
var/turf/T = get_turf(src)
if(T)
state_open = 1
Expand All @@ -154,9 +154,10 @@ Class Procs:
occupant.client.perspective = MOB_PERSPECTIVE
occupant = null
update_icon()
updateUsrDialog()
if(updateDialog)
updateUsrDialog()

/obj/machinery/proc/close_machine(mob/living/target = null)
/obj/machinery/proc/close_machine(mob/living/target = null, updateDialog = 1)
state_open = 0
density = 1
if(!target)
Expand All @@ -172,7 +173,8 @@ Class Procs:
occupant = target
target.loc = src
target.stop_pulling()
updateUsrDialog()
if(updateDialog)
updateUsrDialog()
update_icon()

/obj/machinery/ex_act(severity)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,9 @@
//////////////////

/datum/species/proc/spec_attack_hand(var/mob/living/carbon/human/M, var/mob/living/carbon/human/H)
if(!istype(M) || !istype(H))
return 0

if((M != H) && H.check_shields(0, M.name))
add_logs(M, H, "attempted to touch")
H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/drone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,8 @@
else
return

if(!drone)
return
contents -= drone
drone.loc = get_turf(src)
drone.reset_view()
Expand Down

0 comments on commit 47eaae1

Please sign in to comment.