cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentations (#17481)

Browse Source 
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
This commit is contained in:
Fluffy
2023-10-05 10:15:58 +00:00
committed by GitHub
parent 032853824d
commit 4538e2a7cc
471 changed files with 2670 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/autopsy.dm
+1 -2
View File
@@ -17,8 +17,7 @@
/datum/autopsy_data_scanner
var/weapon = null // this is the DEFINITE weapon type that was used
var/list/organs_scanned = list() // this maps a number of scanned organs to
// the wounds to those organs with this data's weapon type
var/list/organs_scanned = list() // this maps a number of scanned organs to the wounds to those organs with this data's weapon type
var/organ_names = ""
/datum/autopsy_data
code/game/objects/items/weapons/cards_ids.dm
+3 -3
View File
@@ -459,9 +459,9 @@ var/const/NO_EMAG_ACT = -50
pickup_sound = /singleton/sound_category/generic_pickup_sound
/obj/item/card/id/ccia/id_flash(var/mob/user)
var/add_text = "Done with prejudice and professionalism, [user.get_pronoun("he")] means business."
var/blind_add_text = "Done with prejudice and professionalism, you mean business."
return ..(user, add_text, blind_add_text)
var/add_text = "Done with prejudice and professionalism, [user.get_pronoun("he")] means business."
var/blind_add_text = "Done with prejudice and professionalism, you mean business."
return ..(user, add_text, blind_add_text)
/obj/item/card/id/ccia/bssb
name = "\improper Biesel Security Services Bureau identification card"
code/game/objects/items/weapons/chaplain_items.dm
+1 -1
View File
@@ -389,4 +389,4 @@
name = "\improper Marryam altar"
desc = "A poppyvase used as an altar to honor Marryam, the Ma'ta'ke deity of settlements, sleep, and parenthood."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "marryam_poppyvase"
icon_state = "marryam_poppyvase"
code/game/objects/items/weapons/circuitboards/_defines.dm
+1 -1
View File
@@ -1,2 +1,2 @@
#define BOARD_MACHINE "machine"
#define BOARD_COMPUTER "computer"
#define BOARD_COMPUTER "computer"
code/game/objects/items/weapons/circuitboards/computer/telecomms.dm
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/comm_monitor
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/biogenerator
@@ -13,4 +13,4 @@
/obj/item/circuitboard/biogenerator/small
name = T_BOARD("small biogenerator")
build_path = /obj/machinery/biogenerator/small
build_path = /obj/machinery/biogenerator/small
code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm
+1 -1
View File
@@ -9,4 +9,4 @@
origin_tech = list(TECH_DATA = 1, TECH_BIO = 2)
req_components = list(
"/obj/item/stock_parts/manipulator" = 3
)
)
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/clonepod
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
+1 -1
View File
@@ -12,4 +12,4 @@
"/obj/item/stock_parts/manipulator" = 2,
"/obj/item/stock_parts/subspace/filter" = 1,
"/obj/item/stock_parts/subspace/crystal" = 1
)
)
code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm
+1 -1
View File
@@ -19,4 +19,4 @@
req_components = list(
"/obj/item/stock_parts/capacitor" = 3,
"/obj/item/stock_parts/scanning_module" = 2,
"/obj/item/stock_parts/manipulator" = 3)
"/obj/item/stock_parts/manipulator" = 3)
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
+1 -1
View File
@@ -18,4 +18,4 @@
build_path = /obj/machinery/mining/brace
board_type = "machine"
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
req_components = list()
req_components = list()
code/game/objects/items/weapons/circuitboards/machinery/mining_machines.dm
+1 -1
View File
@@ -75,4 +75,4 @@
if(WEST)
M.pixel_x = -32
if(SOUTH)
M.pixel_y = -32
M.pixel_y = -32
code/game/objects/items/weapons/circuitboards/machinery/portgen.dm
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/portgen
@@ -27,4 +27,4 @@
/obj/item/circuitboard/portgen/fusion
name = T_BOARD("minature fusion reactor")
build_path = /obj/machinery/power/portgen/basic/fusion
origin_tech = list(TECH_DATA = 5, TECH_POWER = 7, TECH_ENGINEERING = 7)
origin_tech = list(TECH_DATA = 5, TECH_POWER = 7, TECH_ENGINEERING = 7)
code/game/objects/items/weapons/circuitboards/machinery/power.dm
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/smes
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/recharge_station
@@ -11,4 +11,4 @@
"/obj/item/stack/cable_coil" = 5,
"/obj/item/stock_parts/capacitor" = 2,
"/obj/item/stock_parts/manipulator" = 2,
"/obj/item/cell" = 1)
"/obj/item/cell" = 1)
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/shield_gen_ex
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/telecomms
code/game/objects/items/weapons/circuitboards/machinery/trolley.dm
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/circuitboard/cargo_trolley
@@ -10,4 +10,4 @@
req_components = list(
"/obj/item/stack/cable_coil" = 15,
"/obj/item/stock_parts/capacitor" = 1
)
)
code/game/objects/items/weapons/cosmetics.dm
+11 -11
View File
@@ -123,15 +123,15 @@
return
if(H == user)
user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
"<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
"<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
H.lipstick_color = lipstick_color
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
"<span class='notice'>You begin to apply \the [src].</span>")
"<span class='notice'>You begin to apply \the [src].</span>")
if(do_after(user, 4 SECONDS, H, do_flags = DO_DEFAULT & ~DO_SHOW_PROGRESS & ~DO_BOTH_CAN_TURN))
user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
"<span class='notice'>You apply \the [src].</span>")
"<span class='notice'>You apply \the [src].</span>")
H.lipstick_color = lipstick_color
H.update_body()
else
@@ -199,20 +199,20 @@
if(H == user) //shaving yourself
user.visible_message("\The [user] starts to shave [user.get_pronoun("his")] head with \the [src].", \
"<span class='notice'>You start to shave your head with \the [src].</span>")
"<span class='notice'>You start to shave your head with \the [src].</span>")
if(do_mob(user, user, 20))
user.visible_message("\The [user] shaves [user.get_pronoun("his")] head with \the [src].", \
"<span class='notice'>You finish shaving with \the [src].</span>")
"<span class='notice'>You finish shaving with \the [src].</span>")
shave(H, target_zone)
return TRUE
else
user.visible_message("<span class='warning'>\The [user] tries to shave \the [H]'s head with \the [src]!</span>", \
"<span class='notice'>You start shaving [H]'s head.</span>")
"<span class='notice'>You start shaving [H]'s head.</span>")
if(do_mob(user, H, 20))
user.visible_message("<span class='warning'>\The [user] shaves \the [H]'s head bald with \the [src]!</span>", \
"<span class='notice'>You shave \the [H]'s head bald.</span>")
"<span class='notice'>You shave \the [H]'s head bald.</span>")
shave(H, target_zone)
return TRUE
@@ -233,20 +233,20 @@
if(H == user) //shaving yourself
user.visible_message("<span class='warning'>\The [user] starts to shave [user.get_pronoun("his")] facial hair with \the [src].</span>", \
"<span class='notice'>You take a moment to shave your facial hair with \the [src].</span>")
"<span class='notice'>You take a moment to shave your facial hair with \the [src].</span>")
if(do_mob(user, user, 20))
user.visible_message("<span class='warning'>\The [user] shaves [user.get_pronoun("his")] facial hair clean with \the [src].</span>", \
"<span class='notice'>You finish shaving with \the [src].</span>")
"<span class='notice'>You finish shaving with \the [src].</span>")
shave(H, target_zone)
return TRUE
else
user.visible_message("<span class='warning'>\The [user] tries to shave \the [H]'s facial hair with \the [src].</span>", \
"<span class='notice'>You start shaving [H]'s facial hair.</span>")
"<span class='notice'>You start shaving [H]'s facial hair.</span>")
if(do_mob(user, H, 20))
user.visible_message("<span class='warning'>\The [user] shaves off \the [H]'s facial hair with \the [src].</span>", \
"<span class='notice'>You shave [H]'s facial hair clean off.</span>")
"<span class='notice'>You shave [H]'s facial hair clean off.</span>")
shave(H, target_zone)
return TRUE
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -71,4 +71,4 @@
if(R?.cell)
R.cell.use(1000)
can_deploy = TRUE
maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
code/game/objects/items/weapons/manuals.dm
+48 -48
View File
@@ -465,80 +465,80 @@
<h3>Standard Cyborg</h3>
The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.<br>A Standard Cyborg comes with:
<ul>
<li>Crowbar</li>
<li>Stun Baton</li>
<li>Health Analyzer</li>
<li>Fire Extinguisher</li>
<li>Crowbar</li>
<li>Stun Baton</li>
<li>Health Analyzer</li>
<li>Fire Extinguisher</li>
</ul>
<h3>Engineering Cyborg</h3>
The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.<br>An Engineering Cyborg comes with:
<ul>
<li>A basic set of engineering tools</li>
<li>Metal Synthesizer</li>
<li>Reinforced Glass Synthesizer</li>
<li>A Rapid-Fabrication-Device C-Class</li>
<li>Wire Synthesizer</li>
<li>Fire Extinguisher</li>
<li>Built-in Optical Meson Scanners</li>
<li>A basic set of engineering tools</li>
<li>Metal Synthesizer</li>
<li>Reinforced Glass Synthesizer</li>
<li>A Rapid-Fabrication-Device C-Class</li>
<li>Wire Synthesizer</li>
<li>Fire Extinguisher</li>
<li>Built-in Optical Meson Scanners</li>
</ul>
<h3>Mining Cyborg</h3>
The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.<br>A Mining Cyborg comes with:
<ul>
<li>Jackhammer</li>
<li>Shovel</li>
<li>Mining Satchel</li>
<li>Built-in Optical Meson Scanners</li>
<li>Jackhammer</li>
<li>Shovel</li>
<li>Mining Satchel</li>
<li>Built-in Optical Meson Scanners</li>
</ul>
<h3>Security Cyborg</h3>
The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.<br>A Security Cyborg comes with:
<ul>
<li>Stun Baton</li>
<li>Handcuffs</li>
<li>Taser</li>
<li>Stun Baton</li>
<li>Handcuffs</li>
<li>Taser</li>
</ul>
<h3>Janitor Cyborg</h3>
The Janitor Cyborg module is equipped with various cleaning-facilitating devices.<br>A Janitor Cyborg comes with:
<ul>
<li>Mop</li>
<li>Hand Bucket</li>
<li>Cleaning Spray Synthesizer and Spray Nozzle</li>
<li>Mop</li>
<li>Hand Bucket</li>
<li>Cleaning Spray Synthesizer and Spray Nozzle</li>
</ul>
<h3>Service Cyborg</h3>
The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros."<br>A Service Cyborg comes with:
<ul>
<li>Shaker</li>
<li>Industrial Dropper</li>
<li>Platter</li>
<li>Beer Synthesizer</li>
<li>Zippo Lighter</li>
<li>Rapid-Service-Fabricator (Produces various entertainment and refreshment objects)</li>
<li>Pen</li>
<li>Shaker</li>
<li>Industrial Dropper</li>
<li>Platter</li>
<li>Beer Synthesizer</li>
<li>Zippo Lighter</li>
<li>Rapid-Service-Fabricator (Produces various entertainment and refreshment objects)</li>
<li>Pen</li>
</ul>
<h2><a name="Construction">Cyborg Construction</h2>
Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies.<br>The required materials to make a cyborg are:
<ul>
<li>Metal</li>
<li>Two Flashes</li>
<li>One Power Cell (Preferably rated to 15000w)</li>
<li>Some electrical wires</li>
<li>One Human Brain</li>
<li>One Man-Machine Interface</li>
<li>Metal</li>
<li>Two Flashes</li>
<li>One Power Cell (Preferably rated to 15000w)</li>
<li>Some electrical wires</li>
<li>One Human Brain</li>
<li>One Man-Machine Interface</li>
</ul>
Once you have acquired the materials, you can start on construction of your cyborg.<br>To construct a cyborg, follow the steps below:
<ol>
<li>Start the Exosuit Fabricators constructing all of the cyborg parts</li>
<li>While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface</li>
<li>Once you have a Robot Head, place your two flashes inside the eye sockets</li>
<li>Once you have your Robot Chest, wire the Robot chest, then insert the power cell</li>
<li>Attach all of the Robot parts to the Robot frame</li>
<li>Insert the Man-Machine Interface (With the Brain inside) into the Robot Body</li>
<li>Congratulations! You have a new cyborg!</li>
<li>Start the Exosuit Fabricators constructing all of the cyborg parts</li>
<li>While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface</li>
<li>Once you have a Robot Head, place your two flashes inside the eye sockets</li>
<li>Once you have your Robot Chest, wire the Robot chest, then insert the power cell</li>
<li>Attach all of the Robot parts to the Robot frame</li>
<li>Insert the Man-Machine Interface (With the Brain inside) into the Robot Body</li>
<li>Congratulations! You have a new cyborg!</li>
</ol>
<h2><a name="Maintenance">Cyborg Maintenance</h2>
@@ -547,12 +547,12 @@
<h3>Replacing a Power Cell</h3>
Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell.<br>The steps to replace a cell are as follows:
<ol>
<li>Unlock the Cyborg's Interface by swiping your ID on it</li>
<li>Open the Cyborg's outer panel using a crowbar</li>
<li>Remove the old power cell</li>
<li>Insert the new power cell</li>
<li>Close the Cyborg's outer panel using a crowbar</li>
<li>Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell</li>
<li>Unlock the Cyborg's Interface by swiping your ID on it</li>
<li>Open the Cyborg's outer panel using a crowbar</li>
<li>Remove the old power cell</li>
<li>Insert the new power cell</li>
<li>Close the Cyborg's outer panel using a crowbar</li>
<li>Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell</li>
</ol>
<h3>Exposing the Internal Wiring</h3>
@@ -1025,7 +1025,7 @@
EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training,
but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into two sections:
Civilian suits and voidsuits.<BR><BR>
Civilian suits and voidsuits.<BR><BR>
<h2><a name="Civilian">Civilian Suits</a></h2>
<I>The bulkiest things this side of Alpha Centauri</I><BR>
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -12,7 +12,7 @@
* Cash Bag
* Book Bag (New thing)
* Slime Bag (New thing) ~Chaoko99
*
*
* -Sayu
*/
code/game/objects/items/weapons/storage/business_card.dm
+1 -1
View File
@@ -100,4 +100,4 @@
worn_overlay = "business_card-glass-s"
/obj/item/paper/business_card/glass/w
worn_overlay = "business_card-glass-w"
worn_overlay = "business_card-glass-w"
code/game/objects/items/weapons/storage/internal.dm
+1 -1
View File
@@ -196,4 +196,4 @@
var/mob/living/carbon/human/H = E.owner
if(!istype(H))
return
H.update_tail_showing()
H.update_tail_showing()
code/game/objects/items/weapons/swords_axes_etc.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/* Weapons
/* Weapons
* Contains:
* Sword
* Classic Baton
code/game/objects/items/weapons/traps.dm
+4 -4
View File
@@ -382,7 +382,7 @@
to_chat(user, SPAN_WARNING("\The [WT] is off!"))
return
user.visible_message("<span class='notice'>[user] is trying to slice \the [src] open!</span>",
"<span class='notice'>You are trying to slice \the [src] open!</span>")
"<span class='notice'>You are trying to slice \the [src] open!</span>")
if(WT.use_tool(src, user, 60, volume = 50))
if(WT.use(2, user))
@@ -401,14 +401,14 @@
return
user.visible_message("<span class='notice'>[user] is trying to [anchored ? "un" : "" ]secure \the [src]!</span>",
"<span class='notice'>You are trying to [anchored ? "un" : "" ]secure \the [src]!</span>")
"<span class='notice'>You are trying to [anchored ? "un" : "" ]secure \the [src]!</span>")
playsound(src.loc, "sound/items/[pick("Screwdriver", "Screwdriver2")].ogg", 50, 1)
if(W.use_tool(src, user, 30, volume = 50))
density = !density
anchored = !anchored
user.visible_message("<span class='notice'>[user] [anchored ? "" : "un" ]secures \the [src]!</span>",
"<span class='notice'>You [anchored ? "" : "un" ]secure \the [src]!</span>")
"<span class='notice'>You [anchored ? "" : "un" ]secure \the [src]!</span>")
else
..()
@@ -572,7 +572,7 @@
return
user.visible_message("<span class='notice'>[user] begins [anchored ? "un" : "" ]securing \the [src]!</span>",
"<span class='notice'>You begin [anchored ? "un" : "" ]securing \the [src]!</span>")
"<span class='notice'>You begin [anchored ? "un" : "" ]securing \the [src]!</span>")
if(W.use_tool(src, user, 30, volume = 50))
anchored = !anchored