mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-18 06:01:56 +00:00
Merge pull request #2797 from MagmaRam/master
Bugfix: Sprite issues on custom cameras (orange camera and old camera)
This commit is contained in:
Chinsky
226
baystation12.dme
226
baystation12.dme
@@ -6,235 +6,14 @@
|
|||||||
// BEGIN_FILE_DIR
|
// BEGIN_FILE_DIR
|
||||||
#define FILE_DIR .
|
#define FILE_DIR .
|
||||||
#define FILE_DIR "code"
|
#define FILE_DIR "code"
|
||||||
#define FILE_DIR "code/__HELPERS"
|
|
||||||
#define FILE_DIR "code/ATMOSPHERICS"
|
|
||||||
#define FILE_DIR "code/ATMOSPHERICS/components"
|
|
||||||
#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
|
|
||||||
#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices"
|
|
||||||
#define FILE_DIR "code/ATMOSPHERICS/components/unary"
|
|
||||||
#define FILE_DIR "code/controllers"
|
|
||||||
#define FILE_DIR "code/datums"
|
|
||||||
#define FILE_DIR "code/datums/diseases"
|
|
||||||
#define FILE_DIR "code/datums/diseases/advance"
|
|
||||||
#define FILE_DIR "code/datums/diseases/advance/symptoms"
|
|
||||||
#define FILE_DIR "code/datums/helper_datums"
|
|
||||||
#define FILE_DIR "code/datums/spells"
|
|
||||||
#define FILE_DIR "code/defines"
|
|
||||||
#define FILE_DIR "code/defines/obj"
|
|
||||||
#define FILE_DIR "code/defines/procs"
|
|
||||||
#define FILE_DIR "code/FEA"
|
|
||||||
#define FILE_DIR "code/game"
|
|
||||||
#define FILE_DIR "code/game/area"
|
|
||||||
#define FILE_DIR "code/game/gamemodes"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/autotraitor"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/blob"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/blob/blobs"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/changeling"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/cult"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/epidemic"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/events"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/events/holidays"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/extended"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/malfunction"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/meme"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/meteor"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/nuclear"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/revolution"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/sandbox"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/traitor"
|
|
||||||
#define FILE_DIR "code/game/gamemodes/wizard"
|
|
||||||
#define FILE_DIR "code/game/jobs"
|
|
||||||
#define FILE_DIR "code/game/jobs/job"
|
|
||||||
#define FILE_DIR "code/game/machinery"
|
|
||||||
#define FILE_DIR "code/game/machinery/atmoalter"
|
|
||||||
#define FILE_DIR "code/game/machinery/bots"
|
|
||||||
#define FILE_DIR "code/game/machinery/camera"
|
|
||||||
#define FILE_DIR "code/game/machinery/computer"
|
|
||||||
#define FILE_DIR "code/game/machinery/doors"
|
|
||||||
#define FILE_DIR "code/game/machinery/embedded_controller"
|
|
||||||
#define FILE_DIR "code/game/machinery/kitchen"
|
|
||||||
#define FILE_DIR "code/game/machinery/pipe"
|
|
||||||
#define FILE_DIR "code/game/machinery/telecomms"
|
|
||||||
#define FILE_DIR "code/game/magic"
|
|
||||||
#define FILE_DIR "code/game/mecha"
|
|
||||||
#define FILE_DIR "code/game/mecha/combat"
|
|
||||||
#define FILE_DIR "code/game/mecha/equipment"
|
|
||||||
#define FILE_DIR "code/game/mecha/equipment/tools"
|
|
||||||
#define FILE_DIR "code/game/mecha/equipment/weapons"
|
|
||||||
#define FILE_DIR "code/game/mecha/medical"
|
|
||||||
#define FILE_DIR "code/game/mecha/working"
|
|
||||||
#define FILE_DIR "code/game/objects"
|
|
||||||
#define FILE_DIR "code/game/objects/closets"
|
|
||||||
#define FILE_DIR "code/game/objects/closets/secure"
|
|
||||||
#define FILE_DIR "code/game/objects/effects"
|
|
||||||
#define FILE_DIR "code/game/objects/effects/decals"
|
|
||||||
#define FILE_DIR "code/game/objects/effects/decals/Cleanable"
|
|
||||||
#define FILE_DIR "code/game/objects/effects/spawners"
|
|
||||||
#define FILE_DIR "code/game/objects/items"
|
|
||||||
#define FILE_DIR "code/game/objects/items/devices"
|
|
||||||
#define FILE_DIR "code/game/objects/items/devices/PDA"
|
|
||||||
#define FILE_DIR "code/game/objects/items/devices/radio"
|
|
||||||
#define FILE_DIR "code/game/objects/items/robot"
|
|
||||||
#define FILE_DIR "code/game/objects/items/stacks"
|
|
||||||
#define FILE_DIR "code/game/objects/items/stacks/sheets"
|
|
||||||
#define FILE_DIR "code/game/objects/items/stacks/tiles"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons/grenades"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons/implants"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons/melee"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons/storage"
|
|
||||||
#define FILE_DIR "code/game/objects/items/weapons/tanks"
|
|
||||||
#define FILE_DIR "code/game/objects/storage"
|
|
||||||
#define FILE_DIR "code/game/objects/structures"
|
|
||||||
#define FILE_DIR "code/game/objects/structures/crates_lockers"
|
|
||||||
#define FILE_DIR "code/game/objects/structures/crates_lockers/closets"
|
|
||||||
#define FILE_DIR "code/game/objects/structures/crates_lockers/closets/secure"
|
|
||||||
#define FILE_DIR "code/game/objects/structures/stool_bed_chair_nest"
|
|
||||||
#define FILE_DIR "code/game/structure"
|
|
||||||
#define FILE_DIR "code/game/turfs"
|
|
||||||
#define FILE_DIR "code/game/turfs/simulated"
|
|
||||||
#define FILE_DIR "code/game/turfs/space"
|
|
||||||
#define FILE_DIR "code/game/turfs/unsimulated"
|
|
||||||
#define FILE_DIR "code/game/vehicles"
|
|
||||||
#define FILE_DIR "code/game/verbs"
|
|
||||||
#define FILE_DIR "code/js"
|
|
||||||
#define FILE_DIR "code/modules"
|
|
||||||
#define FILE_DIR "code/modules/admin"
|
|
||||||
#define FILE_DIR "code/modules/admin/DB ban"
|
|
||||||
#define FILE_DIR "code/modules/admin/permissionverbs"
|
|
||||||
#define FILE_DIR "code/modules/admin/verbs"
|
|
||||||
#define FILE_DIR "code/modules/assembly"
|
|
||||||
#define FILE_DIR "code/modules/awaymissions"
|
|
||||||
#define FILE_DIR "code/modules/awaymissions/maploader"
|
|
||||||
#define FILE_DIR "code/modules/client"
|
|
||||||
#define FILE_DIR "code/modules/clothing"
|
|
||||||
#define FILE_DIR "code/modules/clothing/glasses"
|
|
||||||
#define FILE_DIR "code/modules/clothing/gloves"
|
|
||||||
#define FILE_DIR "code/modules/clothing/head"
|
|
||||||
#define FILE_DIR "code/modules/clothing/masks"
|
|
||||||
#define FILE_DIR "code/modules/clothing/shoes"
|
|
||||||
#define FILE_DIR "code/modules/clothing/spacesuits"
|
|
||||||
#define FILE_DIR "code/modules/clothing/suits"
|
|
||||||
#define FILE_DIR "code/modules/clothing/under"
|
|
||||||
#define FILE_DIR "code/modules/clothing/under/jobs"
|
|
||||||
#define FILE_DIR "code/modules/customitems"
|
|
||||||
#define FILE_DIR "code/modules/destilery"
|
|
||||||
#define FILE_DIR "code/modules/DetectiveWork"
|
|
||||||
#define FILE_DIR "code/modules/events"
|
|
||||||
#define FILE_DIR "code/modules/flufftext"
|
|
||||||
#define FILE_DIR "code/modules/food"
|
|
||||||
#define FILE_DIR "code/modules/genetics"
|
|
||||||
#define FILE_DIR "code/modules/icon generation"
|
|
||||||
#define FILE_DIR "code/modules/library"
|
|
||||||
#define FILE_DIR "code/modules/liquid"
|
|
||||||
#define FILE_DIR "code/modules/maps"
|
|
||||||
#define FILE_DIR "code/modules/mining"
|
|
||||||
#define FILE_DIR "code/modules/mob"
|
|
||||||
#define FILE_DIR "code/modules/mob/dead"
|
|
||||||
#define FILE_DIR "code/modules/mob/dead/observer"
|
|
||||||
#define FILE_DIR "code/modules/mob/living"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/blob"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/alien"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/alien/special"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/brain"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/human"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/metroid"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/carbon/monkey"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon/ai"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon/ai/freelook"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon/decoy"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon/pai"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/silicon/robot"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/simple_animal"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/simple_animal/friendly"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/simple_animal/hostile"
|
|
||||||
#define FILE_DIR "code/modules/mob/living/simple_animal/hostile/retaliate"
|
|
||||||
#define FILE_DIR "code/modules/mob/new_player"
|
|
||||||
#define FILE_DIR "code/modules/organs"
|
|
||||||
#define FILE_DIR "code/modules/paperwork"
|
|
||||||
#define FILE_DIR "code/modules/power"
|
|
||||||
#define FILE_DIR "code/modules/power/antimatter"
|
|
||||||
#define FILE_DIR "code/modules/power/singularity"
|
|
||||||
#define FILE_DIR "code/modules/power/singularity/particle_accelerator"
|
|
||||||
#define FILE_DIR "code/modules/projectiles"
|
|
||||||
#define FILE_DIR "code/modules/projectiles/ammunition"
|
|
||||||
#define FILE_DIR "code/modules/projectiles/guns"
|
|
||||||
#define FILE_DIR "code/modules/projectiles/guns/energy"
|
|
||||||
#define FILE_DIR "code/modules/projectiles/guns/projectile"
|
|
||||||
#define FILE_DIR "code/modules/projectiles/projectile"
|
|
||||||
#define FILE_DIR "code/modules/reagents"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/food"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/food/drinks/bottle"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/food/snacks"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/glass"
|
|
||||||
#define FILE_DIR "code/modules/reagents/reagent_containers/glass/bottle"
|
|
||||||
#define FILE_DIR "code/modules/recycling"
|
|
||||||
#define FILE_DIR "code/modules/research"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology/artifact"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology/artifact/effects"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology/finds"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology/machinery"
|
|
||||||
#define FILE_DIR "code/modules/research/xenoarchaeology/tools"
|
|
||||||
#define FILE_DIR "code/modules/scripting"
|
|
||||||
#define FILE_DIR "code/modules/scripting/AST"
|
|
||||||
#define FILE_DIR "code/modules/scripting/AST/Operators"
|
|
||||||
#define FILE_DIR "code/modules/scripting/Implementations"
|
|
||||||
#define FILE_DIR "code/modules/scripting/Interpreter"
|
|
||||||
#define FILE_DIR "code/modules/scripting/Parser"
|
|
||||||
#define FILE_DIR "code/modules/scripting/Scanner"
|
|
||||||
#define FILE_DIR "code/modules/security levels"
|
|
||||||
#define FILE_DIR "code/modules/surgery"
|
|
||||||
#define FILE_DIR "code/TriDimension"
|
#define FILE_DIR "code/TriDimension"
|
||||||
#define FILE_DIR "code/unused"
|
|
||||||
#define FILE_DIR "code/unused/beast"
|
|
||||||
#define FILE_DIR "code/unused/computer2"
|
|
||||||
#define FILE_DIR "code/unused/disease2"
|
|
||||||
#define FILE_DIR "code/unused/gamemodes"
|
|
||||||
#define FILE_DIR "code/unused/hivebot"
|
|
||||||
#define FILE_DIR "code/unused/mining"
|
|
||||||
#define FILE_DIR "code/unused/optics"
|
|
||||||
#define FILE_DIR "code/unused/pda2"
|
|
||||||
#define FILE_DIR "code/unused/powerarmor"
|
|
||||||
#define FILE_DIR "code/unused/spacecraft"
|
|
||||||
#define FILE_DIR "code/WorkInProgress"
|
#define FILE_DIR "code/WorkInProgress"
|
||||||
#define FILE_DIR "code/WorkInProgress/AI_Visibility"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/animusstation"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Apples"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
|
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Economy"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
|
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
|
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
|
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
|
||||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
|
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
|
||||||
#define FILE_DIR "code/WorkInProgress/carn"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Chinsky"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Cib"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Cib/amorph"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Mini"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Mloc"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/organs"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Ported"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Ported/Abi79"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Ported/Spawners"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Sigyn"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Sigyn/Department Sec"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Sigyn/Softcurity"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/SkyMarshal"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Susan"
|
#define FILE_DIR "code/WorkInProgress/Susan"
|
||||||
#define FILE_DIR "code/WorkInProgress/Tastyfish"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/virus2"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/virus2/Disease2"
|
|
||||||
#define FILE_DIR "code/WorkInProgress/Wrongnumber"
|
|
||||||
#define FILE_DIR "code/ZAS"
|
|
||||||
#define FILE_DIR "html"
|
#define FILE_DIR "html"
|
||||||
#define FILE_DIR "icons"
|
#define FILE_DIR "icons"
|
||||||
#define FILE_DIR "icons/48x48"
|
#define FILE_DIR "icons/48x48"
|
||||||
@@ -257,9 +36,6 @@
|
|||||||
#define FILE_DIR "icons/turf"
|
#define FILE_DIR "icons/turf"
|
||||||
#define FILE_DIR "icons/vending_icons"
|
#define FILE_DIR "icons/vending_icons"
|
||||||
#define FILE_DIR "icons/xenoarch_icons"
|
#define FILE_DIR "icons/xenoarch_icons"
|
||||||
#define FILE_DIR "interface"
|
|
||||||
#define FILE_DIR "maps"
|
|
||||||
#define FILE_DIR "maps/RandomZLevels"
|
|
||||||
#define FILE_DIR "sound"
|
#define FILE_DIR "sound"
|
||||||
#define FILE_DIR "sound/AI"
|
#define FILE_DIR "sound/AI"
|
||||||
#define FILE_DIR "sound/ambience"
|
#define FILE_DIR "sound/ambience"
|
||||||
@@ -276,8 +52,6 @@
|
|||||||
#define FILE_DIR "sound/violin"
|
#define FILE_DIR "sound/violin"
|
||||||
#define FILE_DIR "sound/voice"
|
#define FILE_DIR "sound/voice"
|
||||||
#define FILE_DIR "sound/weapons"
|
#define FILE_DIR "sound/weapons"
|
||||||
#define FILE_DIR "tools"
|
|
||||||
#define FILE_DIR "tools/Redirector"
|
|
||||||
// END_FILE_DIR
|
// END_FILE_DIR
|
||||||
// BEGIN_PREFERENCES
|
// BEGIN_PREFERENCES
|
||||||
#define DEBUG
|
#define DEBUG
|
||||||
|
|||||||
@@ -105,12 +105,11 @@ var/list/radiochannels = list(
|
|||||||
"Engineering" = 1357,
|
"Engineering" = 1357,
|
||||||
"Security" = 1359,
|
"Security" = 1359,
|
||||||
"Deathsquad" = 1441,
|
"Deathsquad" = 1441,
|
||||||
"Response Team" = 1439,
|
|
||||||
"Syndicate" = 1213,
|
"Syndicate" = 1213,
|
||||||
"Supply" = 1347,
|
"Supply" = 1347,
|
||||||
)
|
)
|
||||||
//depenging helpers
|
//depenging helpers
|
||||||
var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1439,1441,1347)
|
var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347)
|
||||||
var/const/COMM_FREQ = 1353 //command, colored gold in chat window
|
var/const/COMM_FREQ = 1353 //command, colored gold in chat window
|
||||||
var/const/SYND_FREQ = 1213
|
var/const/SYND_FREQ = 1213
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,7 @@
|
|||||||
if(user.mind.special_role)
|
if(user.mind.special_role)
|
||||||
usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access."
|
usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access."
|
||||||
|
|
||||||
/obj/item/weapon/card/id/syndicate/var/mob/registered_user = null
|
|
||||||
/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
|
/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
|
||||||
if(!src.registered_name)
|
if(!src.registered_name)
|
||||||
//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
|
//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
|
||||||
@@ -148,27 +148,6 @@
|
|||||||
src.assignment = u
|
src.assignment = u
|
||||||
src.name = "[src.registered_name]'s ID Card ([src.assignment])"
|
src.name = "[src.registered_name]'s ID Card ([src.assignment])"
|
||||||
user << "\blue You successfully forge the ID card."
|
user << "\blue You successfully forge the ID card."
|
||||||
registered_user = user
|
|
||||||
else if(registered_user == user)
|
|
||||||
switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
|
|
||||||
if("Rename")
|
|
||||||
var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26)
|
|
||||||
if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
|
|
||||||
alert("Invalid name.")
|
|
||||||
return
|
|
||||||
src.registered_name = t
|
|
||||||
|
|
||||||
var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
|
|
||||||
if(!u)
|
|
||||||
alert("Invalid assignment.")
|
|
||||||
src.registered_name = ""
|
|
||||||
return
|
|
||||||
src.assignment = u
|
|
||||||
src.name = "[src.registered_name]'s ID Card ([src.assignment])"
|
|
||||||
user << "\blue You successfully forge the ID card."
|
|
||||||
return
|
|
||||||
if("Show")
|
|
||||||
..()
|
|
||||||
else
|
else
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
else
|
else
|
||||||
new /obj/item/weapon/storage/backpack/satchel_cap(src)
|
new /obj/item/weapon/storage/backpack/satchel_cap(src)
|
||||||
new /obj/item/clothing/suit/captunic(src)
|
new /obj/item/clothing/suit/captunic(src)
|
||||||
new /obj/item/clothing/suit/capjacket(src)
|
new /obj/item/clothing/suit/captunic/capjacket(src)
|
||||||
new /obj/item/clothing/head/helmet/cap(src)
|
new /obj/item/clothing/head/helmet/cap(src)
|
||||||
new /obj/item/clothing/under/rank/captain(src)
|
new /obj/item/clothing/under/rank/captain(src)
|
||||||
new /obj/item/clothing/suit/armor/vest(src)
|
new /obj/item/clothing/suit/armor/vest(src)
|
||||||
|
|||||||
@@ -21,11 +21,11 @@
|
|||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT
|
||||||
|
|
||||||
/obj/item/clothing/suit/capjacket
|
/obj/item/clothing/suit/captunic/capjacket
|
||||||
name = "captain's uniform jacket"
|
name = "captain's uniform jacket"
|
||||||
desc = "A less formal jacket for everyday captain use."
|
desc = "A less formal jacket for everyday captain use."
|
||||||
icon_state = "capjacket"
|
icon_state = "capjacket"
|
||||||
item_state = "capjacket"
|
item_state = "bio_suit"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT
|
||||||
|
|
||||||
|
|||||||
@@ -350,7 +350,7 @@
|
|||||||
flags_inv = HIDESHOES
|
flags_inv = HIDESHOES
|
||||||
|
|
||||||
/obj/item/clothing/under/wedding/bride_white
|
/obj/item/clothing/under/wedding/bride_white
|
||||||
name = "silk wedding dress"
|
name = "orange wedding dress"
|
||||||
desc = "A white wedding gown made from the finest silk."
|
desc = "A white wedding gown made from the finest silk."
|
||||||
icon_state = "bride_white"
|
icon_state = "bride_white"
|
||||||
color = "bride_white"
|
color = "bride_white"
|
||||||
|
|||||||
@@ -200,6 +200,8 @@ hi
|
|||||||
icon = 'custom_items.dmi'
|
icon = 'custom_items.dmi'
|
||||||
desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
|
desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
|
||||||
icon_state = "orangecamera"
|
icon_state = "orangecamera"
|
||||||
|
icon_on = "orangecamera"
|
||||||
|
icon_off = "camera_off"
|
||||||
pictures_left = 30
|
pictures_left = 30
|
||||||
|
|
||||||
/obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash
|
/obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash
|
||||||
@@ -207,6 +209,8 @@ hi
|
|||||||
icon = 'custom_items.dmi'
|
icon = 'custom_items.dmi'
|
||||||
desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue."
|
desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue."
|
||||||
icon_state = "oldcamera"
|
icon_state = "oldcamera"
|
||||||
|
icon_on = "oldcamera"
|
||||||
|
icon_off = "oldcamera_off"
|
||||||
pictures_left = 30
|
pictures_left = 30
|
||||||
|
|
||||||
/obj/item/weapon/card/id/fluff/lifetime //fastler: Fastler Greay; it seemed like something multiple people would have
|
/obj/item/weapon/card/id/fluff/lifetime //fastler: Fastler Greay; it seemed like something multiple people would have
|
||||||
|
|||||||
@@ -122,6 +122,8 @@
|
|||||||
var/pictures_max = 10
|
var/pictures_max = 10
|
||||||
var/pictures_left = 10
|
var/pictures_left = 10
|
||||||
var/on = 1
|
var/on = 1
|
||||||
|
var/icon_on = "camera"
|
||||||
|
var/icon_off = "camera_off"
|
||||||
|
|
||||||
|
|
||||||
/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
||||||
@@ -130,9 +132,9 @@
|
|||||||
/obj/item/device/camera/attack_self(mob/user as mob)
|
/obj/item/device/camera/attack_self(mob/user as mob)
|
||||||
on = !on
|
on = !on
|
||||||
if(on)
|
if(on)
|
||||||
src.icon_state = "camera"
|
src.icon_state = icon_on
|
||||||
else
|
else
|
||||||
src.icon_state = "camera_off"
|
src.icon_state = icon_off
|
||||||
user << "You switch the camera [on ? "on" : "off"]."
|
user << "You switch the camera [on ? "on" : "off"]."
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -253,8 +255,8 @@
|
|||||||
pictures_left--
|
pictures_left--
|
||||||
desc = "A polaroid camera. It has [pictures_left] photos left."
|
desc = "A polaroid camera. It has [pictures_left] photos left."
|
||||||
user << "<span class='notice'>[pictures_left] photos left.</span>"
|
user << "<span class='notice'>[pictures_left] photos left.</span>"
|
||||||
icon_state = "camera_off"
|
icon_state = icon_off
|
||||||
on = 0
|
on = 0
|
||||||
spawn(64)
|
spawn(64)
|
||||||
icon_state = "camera"
|
icon_state = icon_on
|
||||||
on = 1
|
on = 1
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
@@ -872,7 +872,7 @@
|
|||||||
"aqN" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor,/area/hallway/primary/fore)
|
"aqN" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor,/area/hallway/primary/fore)
|
||||||
"aqO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore)
|
"aqO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore)
|
||||||
"aqP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/fsmaint)
|
"aqP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/fsmaint)
|
||||||
"aqQ" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor,/area/maintenance/fsmaint)
|
"aqQ" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/wall,/area/maintenance/fsmaint)
|
||||||
"aqR" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Security Maintenance APC"; pixel_y = 24},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
"aqR" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Security Maintenance APC"; pixel_y = 24},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
||||||
"aqS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
"aqS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
||||||
"aqT" = (/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
"aqT" = (/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
|
||||||
@@ -4842,7 +4842,7 @@
|
|||||||
"bPf" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "whitegreencorner"},/area/medical/medbay)
|
"bPf" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "whitegreencorner"},/area/medical/medbay)
|
||||||
"bPg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/washing_machine,/turf/simulated/floor{dir = 2; icon_state = "whitegreencorner"},/area/medical/medbay)
|
"bPg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/washing_machine,/turf/simulated/floor{dir = 2; icon_state = "whitegreencorner"},/area/medical/medbay)
|
||||||
"bPh" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "medpriv4"; name = "Privacy Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay)
|
"bPh" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "medpriv4"; name = "Privacy Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay)
|
||||||
"bPi" = (/obj/effect/landmark/start{name = "Psychiatrist"},/obj/structure/stool/bed/chair/comfy/teal{tag = "icon-comfychair_teal (EAST)"; icon_state = "comfychair_teal"; dir = 4},/obj/machinery/door_control{id = "medpriv1"; name = "Privacy Shutters"; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
"bPi" = (/obj/effect/landmark/start{name = "Psychiatrist"},/obj/structure/stool/bed/chair/comfy/teal{tag = "icon-comfychair_teal (EAST)"; icon_state = "comfychair_teal"; dir = 4},/obj/machinery/door_control{id = "medpriv1"; name = "Privacy Shutters"; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
||||||
"bPj" = (/obj/structure/table,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
"bPj" = (/obj/structure/table,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
||||||
"bPk" = (/obj/structure/stool/bed/chair/comfy/teal{tag = "icon-comfychair_teal (WEST)"; icon_state = "comfychair_teal"; dir = 8},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; level = 2; on = 1},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
"bPk" = (/obj/structure/stool/bed/chair/comfy/teal{tag = "icon-comfychair_teal (WEST)"; icon_state = "comfychair_teal"; dir = 8},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; level = 2; on = 1},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
||||||
"bPl" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/obj/machinery/camera{c_tag = "Psychiatric Office"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = -22},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
"bPl" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/obj/machinery/camera{c_tag = "Psychiatric Office"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = -22},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay)
|
||||||
|
|||||||
Reference in New Issue
Block a user