mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 07:28:53 +01:00
Merge pull request #14551 from VOREStation/upstream-merge-8962
[MIRROR] /tg/ era language pass
This commit is contained in:
Heroman3003
@@ -1,6 +1,6 @@
|
||||
/obj/item/device/flash
|
||||
name = "flash"
|
||||
desc = "Used for blinding and being an asshole."
|
||||
desc = "Used for blinding and disorienting."
|
||||
icon_state = "flash"
|
||||
item_state = "flashtool"
|
||||
throwforce = 5
|
||||
|
||||
@@ -212,37 +212,37 @@
|
||||
|
||||
/obj/item/device/radio/headset/heads/rd
|
||||
name = "research director's headset"
|
||||
desc = "Headset of the researching God."
|
||||
desc = "Headset of the eccentric-in-chief."
|
||||
icon_state = "com_headset"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/rd
|
||||
|
||||
/obj/item/device/radio/headset/heads/rd/alt
|
||||
name = "research director's bowman headset"
|
||||
desc = "Headset of the researching God."
|
||||
desc = "Headset of the eccentric-in-chief."
|
||||
icon_state = "com_headset_alt"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/rd
|
||||
|
||||
/obj/item/device/radio/headset/heads/hos
|
||||
name = "head of security's headset"
|
||||
desc = "The headset of the man who protects your worthless lifes."
|
||||
desc = "The headset of the hardass who protects your worthless lifes."
|
||||
icon_state = "com_headset"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/hos
|
||||
|
||||
/obj/item/device/radio/headset/heads/hos/alt
|
||||
name = "head of security's bowman headset"
|
||||
desc = "The headset of the man who protects your worthless lifes."
|
||||
desc = "The headset of the hardass who protects your worthless lifes."
|
||||
icon_state = "com_headset_alt"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/hos
|
||||
|
||||
/obj/item/device/radio/headset/heads/ce
|
||||
name = "chief engineer's headset"
|
||||
desc = "The headset of the guy who is in charge of morons"
|
||||
desc = "The headset of the clown who is in charge of the circus."
|
||||
icon_state = "com_headset"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/ce
|
||||
|
||||
/obj/item/device/radio/headset/heads/ce/alt
|
||||
name = "chief engineer's bowman headset"
|
||||
desc = "The headset of the guy who is in charge of morons"
|
||||
desc = "The headset of the clown who is in charge of the circus."
|
||||
icon_state = "com_headset_alt"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/ce
|
||||
|
||||
@@ -260,13 +260,13 @@
|
||||
|
||||
/obj/item/device/radio/headset/heads/hop
|
||||
name = "head of personnel's headset"
|
||||
desc = "The headset of the guy who will one day be Site Manager."
|
||||
desc = "The headset of the poor fool who will one day be Site Manager."
|
||||
icon_state = "com_headset"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/hop
|
||||
|
||||
/obj/item/device/radio/headset/heads/hop/alt
|
||||
name = "head of personnel's bowman headset"
|
||||
desc = "The headset of the guy who will one day be Site Manager."
|
||||
desc = "The headset of the poor fool who will one day be Site Manager."
|
||||
icon_state = "com_headset_alt"
|
||||
ks2type = /obj/item/device/encryptionkey/heads/hop
|
||||
|
||||
@@ -279,13 +279,13 @@
|
||||
|
||||
/obj/item/device/radio/headset/headset_cargo
|
||||
name = "supply radio headset"
|
||||
desc = "A headset used by the QM and his slaves."
|
||||
desc = "A headset used by the QM and their cronies."
|
||||
icon_state = "cargo_headset"
|
||||
ks2type = /obj/item/device/encryptionkey/headset_cargo
|
||||
|
||||
/obj/item/device/radio/headset/headset_cargo/alt
|
||||
name = "supply bowman headset"
|
||||
desc = "A bowman headset used by the QM and his slaves."
|
||||
desc = "A bowman headset used by the QM and their cronies."
|
||||
icon_state = "cargo_headset_alt"
|
||||
ks2type = /obj/item/device/encryptionkey/headset_cargo
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@
|
||||
drop_sound = 'sound/items/drop/soda.ogg'
|
||||
pickup_sound = 'sound/items/pickup/soda.ogg'
|
||||
|
||||
/obj/item/trash/spacercake_wrap
|
||||
/obj/item/trash/spacer_cake_wrap
|
||||
name = "snack cake wrapper"
|
||||
icon_state = "spacercake_wrap"
|
||||
|
||||
@@ -416,6 +416,10 @@
|
||||
name = "burrito packaging"
|
||||
icon_state = "smolburrito"
|
||||
|
||||
/obj/item/trash/candybowl
|
||||
name = "candy bowl"
|
||||
icon_state = "candy_bowl"
|
||||
|
||||
/obj/item/trash/brainzsnax
|
||||
name = "\improper BrainzSnax can"
|
||||
icon_state = "brainzsnax"
|
||||
@@ -426,4 +430,4 @@
|
||||
name = "\improper BrainzSnax RED can"
|
||||
icon_state = "brainzsnaxred"
|
||||
drop_sound = 'sound/items/drop/soda.ogg'
|
||||
pickup_sound = 'sound/items/pickup/soda.ogg'
|
||||
pickup_sound = 'sound/items/pickup/soda.ogg'
|
||||
|
||||
@@ -427,11 +427,11 @@ AI MODULES
|
||||
origin_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 1)
|
||||
laws = new/datum/ai_laws/nanotrasen_aggressive()
|
||||
|
||||
/******************** Syndicate Directives ********************/
|
||||
/******************** Mercenary Directives ********************/
|
||||
|
||||
/obj/item/weapon/aiModule/syndicate_override
|
||||
name = "\improper 'Syndicate Directives' core AI module"
|
||||
desc = "A 'Syndicate Directives' Core AI Module: 'Reconfigures the AI's core laws.'"
|
||||
name = "\improper 'Mercenary Directives' core AI module"
|
||||
desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'"
|
||||
origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4)
|
||||
laws = new/datum/ai_laws/syndicate_override()
|
||||
|
||||
|
||||
@@ -267,7 +267,7 @@
|
||||
color = reagents.get_color()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021
|
||||
/obj/item/weapon/storage/box/pocky
|
||||
name = "\improper Totemo yoi Pocky"
|
||||
desc = "A bundle of chocolate-coated bisquit sticks."
|
||||
icon = 'icons/obj/food_snacks.dmi'
|
||||
@@ -282,7 +282,7 @@
|
||||
foldable = null
|
||||
trash = /obj/item/trash/pocky
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/pocky //ADDITION 04/17/2021
|
||||
/obj/item/clothing/mask/chewable/candy/pocky
|
||||
name = "chocolate pocky"
|
||||
desc = "A chocolate-coated biscuit stick."
|
||||
icon_state = "pockystick"
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
|
||||
//Transfer 5% of current tank air contents to turf
|
||||
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100))
|
||||
//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE
|
||||
//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is mischievious and I could probably make it work without fucking it up like this, but there you have it. -- TLE
|
||||
new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target))
|
||||
air_transfer.gas["phoron"] = 0
|
||||
target.assume_air(air_transfer)
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
|
||||
/obj/item/weapon/card/id/gold/captain/spare
|
||||
name = "\improper Site Manager's spare ID"
|
||||
desc = "The spare ID of the High Lord himself."
|
||||
desc = "The emergency spare ID for the station's very own Big Cheese."
|
||||
icon_state = "gold-id-alternate"
|
||||
registered_name = "Site Manager"
|
||||
|
||||
|
||||
@@ -88,9 +88,9 @@
|
||||
return name
|
||||
|
||||
/obj/item/weapon/card/id/syndicate_command
|
||||
name = "syndicate ID card"
|
||||
desc = "An ID straight from the Syndicate."
|
||||
registered_name = "Syndicate"
|
||||
assignment = "Syndicate Commander"
|
||||
name = "operative ID card"
|
||||
desc = "An ID straight from a mercenary organisation."
|
||||
registered_name = "Operative"
|
||||
assignment = "Operative Commander"
|
||||
icon_state = "syndicate-id"
|
||||
access = list(access_syndicate, access_external_airlocks)
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
|
||||
<h2>Power outage</h2>
|
||||
|
||||
A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps:
|
||||
A power problem has made the entire station lose power? Could be station-wide wiring problems or illegal power sinks. In any case follow these steps:
|
||||
|
||||
<ol>
|
||||
<li><b><font color='red'>PANIC!</font></b></li>
|
||||
@@ -1112,7 +1112,7 @@
|
||||
name = "Fission Mailed: Nuclear Sabotage 101"
|
||||
icon_state ="bookNuclear"
|
||||
item_state = "book8"
|
||||
author = "Syndicate"
|
||||
author = "Stealth Assault Enterprises"
|
||||
title = "Fission Mailed: Nuclear Sabotage 101"
|
||||
|
||||
dat = {"<html>
|
||||
@@ -1128,7 +1128,7 @@
|
||||
</head>
|
||||
<body>
|
||||
<h1>Nuclear Explosives 101</h1>
|
||||
Hello and thank you for choosing the Syndicate for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.<br><br>
|
||||
Hello and thank you for choosing Stealth Assault Enterprises for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.<br><br>
|
||||
|
||||
First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done, to unbolt it, one must completely log in, which at this time may not be possible.<br>
|
||||
|
||||
@@ -1144,7 +1144,7 @@
|
||||
|
||||
You now have activated the device. To deactivate the buttons at anytime, for example when you've already prepped the bomb for detonation, remove the authentication disk OR press R on the keypad.<br><br>
|
||||
Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. Toggle off the SAFETY.<br>
|
||||
<b>Note</b>: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.<br><br>
|
||||
<b>Note</b>: You wouldn't believe how many SAARE Operatives with doctorates have forgotten this step.<br><br>
|
||||
|
||||
So use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.<br>
|
||||
<b>Note</b>: THE BOMB IS STILL SET AND WILL DETONATE<br><br>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
/obj/item/weapon/storage/toolbox
|
||||
name = "toolbox"
|
||||
desc = "Danger. Very robust."
|
||||
desc = "A metal toolbox with remarkably robust construction."
|
||||
icon = 'icons/obj/storage_vr.dmi'
|
||||
icon_state = "red"
|
||||
item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red")
|
||||
|
||||
@@ -370,7 +370,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
|
||||
|
||||
|
||||
|
||||
//old style retardo-cart
|
||||
//old style mischievio-cart
|
||||
/obj/structure/bed/chair/janicart
|
||||
name = "janicart"
|
||||
icon = 'icons/obj/vehicles.dmi'
|
||||
|
||||
@@ -256,12 +256,12 @@
|
||||
|
||||
/obj/structure/sign/redcross
|
||||
name = "medbay"
|
||||
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
|
||||
desc = "An interstellar symbol of medical institutions. You'll probably get help here."
|
||||
icon_state = "bluecross"
|
||||
|
||||
/obj/structure/sign/greencross
|
||||
name = "medbay"
|
||||
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
|
||||
desc = "An interstellar symbol of medical institutions. You'll probably get help here."
|
||||
icon_state = "bluecross2"
|
||||
|
||||
/obj/structure/sign/goldenplaque
|
||||
|
||||
Reference in New Issue
Block a user