cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issues with indented absolute path definitions

Browse Source
This commit is contained in:
GinjaNinja32
2015-12-09 14:00:09 +00:00
parent 67c53ddd1d
commit 1921c35231
22 changed files with 125 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/names.dm
View File

@@ -161,7 +161,7 @@ var/syndicate_code_response//Code response for traitors.
Obviously, some people will be better at this than others but in theory, everyone should be able to do it and it only enhances roleplay. Obviously, some people will be better at this than others but in theory, everyone should be able to do it and it only enhances roleplay.
Can probably be done through "{ }" but I don't really see the practical benefit. Can probably be done through "{ }" but I don't really see the practical benefit.
One example of an earlier system is commented below. One example of an earlier system is commented below.
/N -N
*/ */
/proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm /proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm

2
code/controllers/hooks.dm
View File

@@ -9,7 +9,7 @@
* *
* To add some code to be called by the hook, define a proc under the type, as so: * To add some code to be called by the hook, define a proc under the type, as so:
* @code * @code
/hook/foo/proc/bar() hook/foo/proc/bar()
if(1) if(1)
return 1 //Sucessful return 1 //Sucessful
else else

6
code/datums/supplypacks.dm
View File

@@ -580,7 +580,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/solar_assembly, /obj/item/solar_assembly,
/obj/item/solar_assembly, /obj/item/solar_assembly,
/obj/item/solar_assembly, /obj/item/solar_assembly,
/obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller /obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller,
/obj/item/weapon/circuitboard/solar_control, /obj/item/weapon/circuitboard/solar_control,
/obj/item/weapon/tracker_electronics, /obj/item/weapon/tracker_electronics,
/obj/item/weapon/paper/solar) /obj/item/weapon/paper/solar)
@@ -642,7 +642,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mecha_ripley /datum/supply_packs/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)" name = "Circuit Crate (\"Ripley\" APLU)"
contains = list(/obj/item/weapon/book/manual/ripley_build_and_repair, contains = list(/obj/item/weapon/book/manual/ripley_build_and_repair,
/obj/item/weapon/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer /obj/item/weapon/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer,
/obj/item/weapon/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer /obj/item/weapon/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer
cost = 30 cost = 30
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure
@@ -652,7 +652,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mecha_odysseus /datum/supply_packs/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")" name = "Circuit Crate (\"Odysseus\")"
contains = list(/obj/item/weapon/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer contains = list(/obj/item/weapon/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer,
/obj/item/weapon/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer /obj/item/weapon/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer
cost = 25 cost = 25
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure

4
code/game/area/Space Station 13 areas.dm
View File

@@ -2166,10 +2166,10 @@ var/list/the_station_areas = list (
/area/rnd, /area/rnd,
/area/storage, /area/storage,
/area/construction, /area/construction,
/area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0 /area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0,
/area/ai_monitored/storage/secure, /area/ai_monitored/storage/secure,
/area/ai_monitored/storage/emergency, /area/ai_monitored/storage/emergency,
/area/turret_protected/ai_upload, //do not try to simplify to "/area/turret_protected" --rastaf0 /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_upload_foyer,
/area/turret_protected/ai, /area/turret_protected/ai,
) )

2
code/game/objects/items/toys.dm
View File

@@ -407,7 +407,7 @@
* Bosun's whistle * Bosun's whistle
*/ */
/obj/item/toy/bosunwhistle /obj/item/toy/bosunwhistle
name = "bosun's whistle" name = "bosun's whistle"
desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow." desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow."
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'

140
code/modules/admin/admin_verbs.dm
View File

@@ -1,74 +1,74 @@
//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
var/list/admin_verbs_default = list( var/list/admin_verbs_default = list(
/datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags,
/client/proc/player_panel, /client/proc/player_panel,
/client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/ /client/proc/toggleadminhelpsound, //toggles whether we hear a sound when adminhelps/PMs are used,
/client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/ /client/proc/deadmin_self, //destroys our own admin datum so we can play as a regular player,
/client/proc/hide_verbs, /*hides all our adminverbs*/ /client/proc/hide_verbs, //hides all our adminverbs,
/client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/ /client/proc/hide_most_verbs, //hides all our hideable adminverbs,
/client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify,
// /client/proc/check_antagonists, /*shows all antags*/ // /client/proc/check_antagonists, //shows all antags,
/client/proc/cmd_mentor_check_new_players /client/proc/cmd_mentor_check_new_players
// /client/proc/deadchat /*toggles deadchat on/off*/ // /client/proc/deadchat //toggles deadchat on/off,
) )
var/list/admin_verbs_admin = list( var/list/admin_verbs_admin = list(
/client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/player_panel_new, //shows an interface for all players, with links to various panels,
/client/proc/invisimin, /*allows our mob to go invisible/visible*/ /client/proc/invisimin, //allows our mob to go invisible/visible,
// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage // /datum/admins/proc/show_traitor_panel, //interface which shows a mob's mind, -Removed due to rare practical use. Moved to debug verbs ~Errorage,
/datum/admins/proc/show_game_mode, /*Configuration window for the current game mode.*/ /datum/admins/proc/show_game_mode, //Configuration window for the current game mode.,
/datum/admins/proc/force_mode_latespawn, /*Force the mode to try a latespawn proc*/ /datum/admins/proc/force_mode_latespawn, //Force the mode to try a latespawn proc,
/datum/admins/proc/force_antag_latespawn, /*Force a specific template to try a latespawn proc*/ /datum/admins/proc/force_antag_latespawn, //Force a specific template to try a latespawn proc,
/datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ /datum/admins/proc/toggleenter, //toggles whether people can join the current game,
/datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /datum/admins/proc/toggleguests, //toggles whether guests can join the current game,
/datum/admins/proc/announce, /*priority announce something to all clients.*/ /datum/admins/proc/announce, //priority announce something to all clients.,
/client/proc/colorooc, /*allows us to set a custom colour for everythign we say in ooc*/ /client/proc/colorooc, //allows us to set a custom colour for everythign we say in ooc,
/client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/admin_ghost, //allows us to ghost/reenter body at will,
/client/proc/toggle_view_range, /*changes how far we can see*/ /client/proc/toggle_view_range, //changes how far we can see,
/datum/admins/proc/view_txt_log, /*shows the server log (diary) for today*/ /datum/admins/proc/view_txt_log, //shows the server log (diary) for today,
/datum/admins/proc/view_atk_log, /*shows the server combat-log, doesn't do anything presently*/ /datum/admins/proc/view_atk_log, //shows the server combat-log, doesn't do anything presently,
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_context, //right-click adminPM interface,
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_pm_panel, //admin-pm list,
/client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head',
/client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc,
/client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/cmd_admin_check_contents, //displays the contents of an instance,
/datum/admins/proc/access_news_network, /*allows access of newscasters*/ /datum/admins/proc/access_news_network, //allows access of newscasters,
/client/proc/giveruntimelog, /*allows us to give access to runtime logs to somebody*/ /client/proc/giveruntimelog, //allows us to give access to runtime logs to somebody,
/client/proc/getserverlog, /*allows us to fetch server logs (diary) for other days*/ /client/proc/getserverlog, //allows us to fetch server logs (diary) for other days,
/client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ /client/proc/jumptocoord, //we ghost and jump to a coordinate,
/client/proc/Getmob, /*teleports a mob to our location*/ /client/proc/Getmob, //teleports a mob to our location,
/client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ /client/proc/Getkey, //teleports a mob with a certain ckey to our location,
// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage // /client/proc/sendmob, //sends a mob somewhere, -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage,
/client/proc/Jump, /client/proc/Jump,
/client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ /client/proc/jumptokey, //allows us to jump to the location of a mob with a certain ckey,
/client/proc/jumptomob, /*allows us to jump to a specific mob*/ /client/proc/jumptomob, //allows us to jump to a specific mob,
/client/proc/jumptoturf, /*allows us to jump to a specific turf*/ /client/proc/jumptoturf, //allows us to jump to a specific turf,
/client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ /client/proc/admin_call_shuttle, //allows us to call the emergency shuttle,
/client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/ /client/proc/admin_cancel_shuttle, //allows us to cancel the emergency shuttle, sending it back to centcomm,
/client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_direct_narrate, //send text directly to a player with no padding. Useful for narratives and fluff-text,
/client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_world_narrate, //sends text to all players with no padding,
/client/proc/cmd_admin_create_centcom_report, /client/proc/cmd_admin_create_centcom_report,
/client/proc/check_words, /*displays cult-words*/ /client/proc/check_words, //displays cult-words,
/client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/check_ai_laws, //shows AI and borg laws,
/client/proc/rename_silicon, /*properly renames silicons*/ /client/proc/rename_silicon, //properly renames silicons,
/client/proc/manage_silicon_laws, /* Allows viewing and editing silicon laws. */ /client/proc/manage_silicon_laws, // Allows viewing and editing silicon laws. ,
/client/proc/check_antagonists, /client/proc/check_antagonists,
/client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ /client/proc/admin_memo, //admin memo system. show/delete/write. +SERVER needed to delete admin memos of others,
/client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ /client/proc/dsay, //talk in deadchat using our ckey/fakekey,
/client/proc/toggleprayers, /*toggles prayers on/off*/ /client/proc/toggleprayers, //toggles prayers on/off,
// /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/ // /client/proc/toggle_hear_deadcast, //toggles whether we hear deadchat,
/client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ /client/proc/toggle_hear_radio, //toggles whether we hear the radio,
/client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/investigate_show, //various admintools for investigation. Such as a singulo grief-log,
/client/proc/secrets, /client/proc/secrets,
/datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ /datum/admins/proc/toggleooc, //toggles ooc on/off for everyone,
/datum/admins/proc/togglelooc, /*toggles looc on/off for everyone*/ /datum/admins/proc/togglelooc, //toggles looc on/off for everyone,
/datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ /datum/admins/proc/toggleoocdead, //toggles ooc on/off for everyone who is dead,
/datum/admins/proc/toggledsay, /*toggles dsay on/off for everyone*/ /datum/admins/proc/toggledsay, //toggles dsay on/off for everyone,
/client/proc/game_panel, /*game panel, allows to change game-mode etc*/ /client/proc/game_panel, //game panel, allows to change game-mode etc,
/client/proc/cmd_admin_say, /*admin-only ooc chat*/ /client/proc/cmd_admin_say, //admin-only ooc chat,
/datum/admins/proc/PlayerNotes, /datum/admins/proc/PlayerNotes,
/client/proc/cmd_mod_say, /client/proc/cmd_mod_say,
/datum/admins/proc/show_player_info, /datum/admins/proc/show_player_info,
/client/proc/free_slot, /*frees slot for chosen job*/ /client/proc/free_slot, //frees slot for chosen job,
/client/proc/cmd_admin_change_custom_event, /client/proc/cmd_admin_change_custom_event,
/client/proc/cmd_admin_rejuvenate, /client/proc/cmd_admin_rejuvenate,
/client/proc/toggleattacklogs, /client/proc/toggleattacklogs,
@@ -79,16 +79,16 @@ var/list/admin_verbs_admin = list(
/client/proc/check_customitem_activity, /client/proc/check_customitem_activity,
/client/proc/man_up, /client/proc/man_up,
/client/proc/global_man_up, /client/proc/global_man_up,
/client/proc/response_team, // Response Teams admin verb /client/proc/response_team, // Response Teams admin verb,
/client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_use,
/client/proc/toggle_antagHUD_restrictions, /client/proc/toggle_antagHUD_restrictions,
/client/proc/allow_character_respawn, /* Allows a ghost to respawn */ /client/proc/allow_character_respawn, // Allows a ghost to respawn ,
/client/proc/event_manager_panel, /client/proc/event_manager_panel,
/client/proc/empty_ai_core_toggle_latejoin, /client/proc/empty_ai_core_toggle_latejoin,
/client/proc/empty_ai_core_toggle_latejoin, /client/proc/empty_ai_core_toggle_latejoin,
/client/proc/aooc, /client/proc/aooc,
/client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ /client/proc/change_human_appearance_admin, // Allows an admin to change the basic appearance of human-based mobs ,
/client/proc/change_human_appearance_self, /* Allows the human-based mob itself change its basic appearance */ /client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance ,
/client/proc/change_security_level, /client/proc/change_security_level,
/client/proc/view_chemical_reaction_logs, /client/proc/view_chemical_reaction_logs,
/client/proc/makePAI /client/proc/makePAI
@@ -126,7 +126,7 @@ var/list/admin_verbs_spawn = list(
/datum/admins/proc/spawn_custom_item, /datum/admins/proc/spawn_custom_item,
/datum/admins/proc/check_custom_items, /datum/admins/proc/check_custom_items,
/datum/admins/proc/spawn_plant, /datum/admins/proc/spawn_plant,
/datum/admins/proc/spawn_atom, /*allows us to spawn instances*/ /datum/admins/proc/spawn_atom, // allows us to spawn instances,
/client/proc/respawn_character, /client/proc/respawn_character,
/client/proc/FireLaser, /client/proc/FireLaser,
/client/proc/FireCannons, /client/proc/FireCannons,
@@ -146,7 +146,7 @@ var/list/admin_verbs_server = list(
/datum/admins/proc/immreboot, /datum/admins/proc/immreboot,
/client/proc/everyone_random, /client/proc/everyone_random,
/datum/admins/proc/toggleAI, /datum/admins/proc/toggleAI,
/client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_delete, // delete an instance/object/mob/etc,
/client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_all,
/datum/admins/proc/adrev, /datum/admins/proc/adrev,
/datum/admins/proc/adspawn, /datum/admins/proc/adspawn,
@@ -158,7 +158,7 @@ var/list/admin_verbs_server = list(
/client/proc/nanomapgen_DumpImage /client/proc/nanomapgen_DumpImage
) )
var/list/admin_verbs_debug = list( var/list/admin_verbs_debug = list(
/client/proc/getruntimelog, /*allows us to access runtime logs to somebody*/ /client/proc/getruntimelog, // allows us to access runtime logs to somebody,
/client/proc/cmd_admin_list_open_jobs, /client/proc/cmd_admin_list_open_jobs,
/client/proc/Debug2, /client/proc/Debug2,
/client/proc/kill_air, /client/proc/kill_air,
@@ -283,12 +283,12 @@ var/list/admin_verbs_hideable = list(
/proc/release /proc/release
) )
var/list/admin_verbs_mod = list( var/list/admin_verbs_mod = list(
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_context, // right-click adminPM interface,
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_pm_panel, // admin-pm list,
/client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/ /client/proc/debug_variables, // allows us to -see- the variables of any instance in the game.,
/client/proc/toggledebuglogs, /client/proc/toggledebuglogs,
/datum/admins/proc/PlayerNotes, /datum/admins/proc/PlayerNotes,
/client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/admin_ghost, // allows us to ghost/reenter body at will,
/client/proc/cmd_mod_say, /client/proc/cmd_mod_say,
/datum/admins/proc/show_player_info, /datum/admins/proc/show_player_info,
/client/proc/player_panel_new, /client/proc/player_panel_new,
@@ -297,7 +297,7 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/show_player_panel, /datum/admins/proc/show_player_panel,
/client/proc/check_antagonists, /client/proc/check_antagonists,
/client/proc/jobbans, /client/proc/jobbans,
/client/proc/cmd_admin_subtle_message /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_subtle_message // send an message to somebody as a 'voice in their head',
) )
var/list/admin_verbs_mentor = list( var/list/admin_verbs_mentor = list(

4
code/modules/admin/verbs/modifyvariables.dm
View File

@@ -1,6 +1,6 @@
var/list/forbidden_varedit_object_types = list( var/list/forbidden_varedit_object_types = list(
/datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea.,
/obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering,
/datum/feedback_variable //Prevents people messing with feedback gathering /datum/feedback_variable //Prevents people messing with feedback gathering
) )

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -235,7 +235,7 @@ Ccomp's first proc.
var/list/mobs = list() var/list/mobs = list()
var/list/ghosts = list() var/list/ghosts = list()
var/list/sortmob = sortAtom(mob_list) // get the mob list. var/list/sortmob = sortAtom(mob_list) // get the mob list.
/var/any=0 var/any=0
for(var/mob/dead/observer/M in sortmob) for(var/mob/dead/observer/M in sortmob)
mobs.Add(M) //filter it where it's only ghosts mobs.Add(M) //filter it where it's only ghosts
any = 1 //if no ghosts show up, any will just be 0 any = 1 //if no ghosts show up, any will just be 0

6
code/modules/client/preferences_gear.dm
View File

@@ -141,13 +141,13 @@ var/global/list/gear_datums = list()
cost = 1 cost = 1
slot = slot_head slot = slot_head
/datum/gear/grcap /datum/gear/grcap
display_name = "cap, grey" display_name = "cap, grey"
path = /obj/item/clothing/head/soft/grey path = /obj/item/clothing/head/soft/grey
cost = 1 cost = 1
slot = slot_head slot = slot_head
/datum/gear/ocap /datum/gear/ocap
display_name = "cap, orange" display_name = "cap, orange"
path = /obj/item/clothing/head/soft/orange path = /obj/item/clothing/head/soft/orange
cost = 1 cost = 1
@@ -219,7 +219,7 @@ var/global/list/gear_datums = list()
cost = 1 cost = 1
slot = slot_head slot = slot_head
/datum/gear/bowler /datum/gear/bowler
display_name = "hat, bowler" display_name = "hat, bowler"
path = /obj/item/clothing/head/bowler path = /obj/item/clothing/head/bowler
cost = 1 cost = 1

12
code/modules/maps/swapmaps.dm
View File

@@ -415,13 +415,13 @@ swapmap
proc/HiCorner(z=z2) proc/HiCorner(z=z2)
return locate(x2,y2,z) return locate(x2,y2,z)
/*
Build procs: Take 2 turfs as corners, plus an item type.
An item may be like:
/turf/wall // Build procs: Take 2 turfs as corners, plus an item type.
/obj/fence{icon_state="iron"} // An item may be like:
*/ //
// /turf/wall
// /obj/fence{icon_state="iron"}
proc/BuildFilledRectangle(turf/T1,turf/T2,item) proc/BuildFilledRectangle(turf/T1,turf/T2,item)
if(!Contains(T1) || !Contains(T2)) return if(!Contains(T1) || !Contains(T2)) return
var/turf/T=T1 var/turf/T=T1

10
code/modules/materials/materials.dm
View File

@@ -5,11 +5,11 @@
self-explanatory but the various object types may have their own documentation. ~Z self-explanatory but the various object types may have their own documentation. ~Z
PATHS THAT USE DATUMS PATHS THAT USE DATUMS
/turf/simulated/wall turf/simulated/wall
/obj/item/weapon/material obj/item/weapon/material
/obj/structure/barricade obj/structure/barricade
/obj/item/stack/material obj/item/stack/material
/obj/structure/table obj/structure/table
VALID ICONS VALID ICONS
WALLS WALLS

2
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -45,7 +45,7 @@
// Combat vars. // Combat vars.
var/total_health = 100 // Point at which the mob will enter crit. var/total_health = 100 // Point at which the mob will enter crit.
var/list/unarmed_types = list( // Possible unarmed attacks that the mob will use in combat. var/list/unarmed_types = list( // Possible unarmed attacks that the mob will use in combat,
/datum/unarmed_attack, /datum/unarmed_attack,
/datum/unarmed_attack/bite /datum/unarmed_attack/bite
) )

6
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -63,9 +63,9 @@
/obj/item/device/mmi, /obj/item/device/mmi,
/obj/item/robot_parts, /obj/item/robot_parts,
/obj/item/borg/upgrade, /obj/item/borg/upgrade,
/obj/item/device/flash, //to build borgs /obj/item/device/flash, //to build borgs,
/obj/item/organ/brain, //to insert into MMIs. /obj/item/organ/brain, //to insert into MMIs,
/obj/item/stack/cable_coil, //again, for borg building /obj/item/stack/cable_coil, //again, for borg building,
/obj/item/weapon/circuitboard, /obj/item/weapon/circuitboard,
/obj/item/slime_extract, /obj/item/slime_extract,
/obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/glass,

2
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -110,7 +110,7 @@
turns_since_move++ turns_since_move++
if(turns_since_move >= turns_per_move) if(turns_since_move >= turns_per_move)
if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled
/var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND
moving_to = pick(cardinal) moving_to = pick(cardinal)
dir = moving_to //How about we turn them the direction they are moving, yay. dir = moving_to //How about we turn them the direction they are moving, yay.
Move(get_step(src,moving_to)) Move(get_step(src,moving_to))

2
code/modules/paperwork/pen.dm
View File

@@ -111,7 +111,7 @@
/* /*
* Parapens * Parapens
*/ */
/obj/item/weapon/pen/reagent/paralysis /obj/item/weapon/pen/reagent/paralysis
origin_tech = "materials=2;syndicate=5" origin_tech = "materials=2;syndicate=5"
/obj/item/weapon/pen/reagent/paralysis/New() /obj/item/weapon/pen/reagent/paralysis/New()

10
code/modules/power/cable.dm
View File

@@ -10,11 +10,11 @@
/* Cable directions (d1 and d2) /* Cable directions (d1 and d2)
9 1 5 > 9 1 5
\ | / > \ | /
8 - 0 - 4 > 8 - 0 - 4
/ | \ > / | \
10 2 6 > 10 2 6
If d1 = 0 and d2 = 0, there's no cable If d1 = 0 and d2 = 0, there's no cable
If d1 = 0 and d2 = dir, it's a O-X cable, getting from the center of the tile to dir (knot cable) If d1 = 0 and d2 = dir, it's a O-X cable, getting from the center of the tile to dir (knot cable)

4
code/modules/reagents/Chemistry-Readme.dm
View File

@@ -127,7 +127,7 @@ About the Holder:
trans_to_obj(var/turf/target, var/amount = 1, var/multiplier = 1, var/copy = 0) trans_to_obj(var/turf/target, var/amount = 1, var/multiplier = 1, var/copy = 0)
If target has reagents, transfers [amount] to it. Otherwise, same as trans_to_turf(). If target has reagents, transfers [amount] to it. Otherwise, same as trans_to_turf().
/atom/proc/create_reagents(var/max_vol) atom/proc/create_reagents(var/max_vol)
Creates a new reagent datum. Creates a new reagent datum.
About Reagents: About Reagents:
@@ -285,7 +285,7 @@ About the Tools:
By default, all atom have a reagents var - but its empty. if you want to use an object for the chem. By default, all atom have a reagents var - but its empty. if you want to use an object for the chem.
system you'll need to add something like this in its new proc: system you'll need to add something like this in its new proc:
/atom/proc/create_reagents(var/max_volume) atom/proc/create_reagents(var/max_volume)
Other important stuff: Other important stuff:

4
code/modules/reagents/dispenser/supply.dm
View File

@@ -127,7 +127,7 @@
group = "Reagents" group = "Reagents"
#define SEC_PACK(_tname, _type, _name, _cname, _cost, _access)\ #define SEC_PACK(_tname, _type, _name, _cname, _cost, _access)\
/datum/supply_packs/dispenser_cartridges{\ datum/supply_packs/dispenser_cartridges{\
_tname {\ _tname {\
name = _name ;\ name = _name ;\
containername = _cname ;\ containername = _cname ;\
@@ -139,7 +139,7 @@
}\ }\
} }
#define PACK(_tname, _type, _name, _cname, _cost)\ #define PACK(_tname, _type, _name, _cname, _cost)\
/datum/supply_packs/dispenser_cartridges{\ datum/supply_packs/dispenser_cartridges{\
_tname {\ _tname {\
name = _name ;\ name = _name ;\
containername = _cname ;\ containername = _cname ;\

38
code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
View File

@@ -18,44 +18,6 @@
#define TRIGGER_CO2 11 #define TRIGGER_CO2 11
#define TRIGGER_NITRO 12 #define TRIGGER_NITRO 12
#define MAX_TRIGGER 12 #define MAX_TRIGGER 12
/*
//sleeping gas appears to be bugged, currently
var/list/valid_primary_effect_types = list(\
/datum/artifact_effect/cellcharge,\
/datum/artifact_effect/celldrain,\
/datum/artifact_effect/forcefield,\
/datum/artifact_effect/gasoxy,\
/datum/artifact_effect/gasplasma,\
/* /datum/artifact_effect/gassleeping,\*/
/datum/artifact_effect/heal,\
/datum/artifact_effect/hurt,\
/datum/artifact_effect/emp,\
/datum/artifact_effect/teleport,\
/datum/artifact_effect/robohurt,\
/datum/artifact_effect/roboheal)
var/list/valid_secondary_effect_types = list(\
/datum/artifact_effect/cold,\
/datum/artifact_effect/badfeeling,\
/datum/artifact_effect/cellcharge,\
/datum/artifact_effect/celldrain,\
/datum/artifact_effect/dnaswitch,\
/datum/artifact_effect/emp,\
/datum/artifact_effect/gasco2,\
/datum/artifact_effect/gasnitro,\
/datum/artifact_effect/gasoxy,\
/datum/artifact_effect/gasphoron,\
/* /datum/artifact_effect/gassleeping,\*/
/datum/artifact_effect/goodfeeling,\
/datum/artifact_effect/heal,\
/datum/artifact_effect/hurt,\
/datum/artifact_effect/radiate,\
/datum/artifact_effect/roboheal,\
/datum/artifact_effect/robohurt,\
/datum/artifact_effect/sleepy,\
/datum/artifact_effect/stun,\
/datum/artifact_effect/teleport)
*/
/obj/machinery/artifact /obj/machinery/artifact
name = "alien artifact" name = "alien artifact"

21
code/modules/research/xenoarchaeology/finds/finds_misc.dm
View File

@@ -10,24 +10,3 @@
/obj/machinery/crystal/New() /obj/machinery/crystal/New()
if(prob(50)) if(prob(50))
icon_state = "crystal2" icon_state = "crystal2"
//large finds
/*
/obj/machinery/syndicate_beacon
/obj/machinery/wish_granter
if(18)
item_type = "jagged green crystal"
additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
icon_state = "crystal"
apply_material_decorations = 0
if(prob(10))
apply_image_decorations = 1
if(19)
item_type = "jagged pink crystal"
additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
icon_state = "crystal2"
apply_material_decorations = 0
if(prob(10))
apply_image_decorations = 1
*/
//machinery type artifacts?

2
code/modules/wireless/interfaces.dm
View File

@@ -31,7 +31,7 @@
addition to) a /wifi/receiver variable. addition to) a /wifi/receiver variable.
You will however need to call the /wifi/senders code to pass commands onto any connected receivers. You will however need to call the /wifi/senders code to pass commands onto any connected receivers.
Example: Example:
/obj/machinery/button/attack_hand() obj/machinery/button/attack_hand()
wifi_sender.activate() wifi_sender.activate()
*/ */
//------------------------------- //-------------------------------

12
maps/RandomZLevels/stationCollision.dm
View File

@@ -19,22 +19,22 @@
* Areas * Areas
*/ */
//Gateroom gets its own APC specifically for the gate //Gateroom gets its own APC specifically for the gate
/area/awaymission/gateroom /area/awaymission/gateroom
//Library, medbay, storage room //Library, medbay, storage room
/area/awaymission/southblock /area/awaymission/southblock
//Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas) //Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas)
/area/awaymission/arrivalblock /area/awaymission/arrivalblock
//Crew quarters, cafeteria, chapel //Crew quarters, cafeteria, chapel
/area/awaymission/midblock /area/awaymission/midblock
//engineering, bridge (not really north but it doesnt really need its own APC) //engineering, bridge (not really north but it doesnt really need its own APC)
/area/awaymission/northblock /area/awaymission/northblock
//That massive research room //That massive research room
/area/awaymission/research /area/awaymission/research
//Syndicate shuttle //Syndicate shuttle
/area/awaymission/syndishuttle /area/awaymission/syndishuttle