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

Final merge

Browse Source 
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
This commit is contained in:
skull132
2016-11-12 00:10:21 +02:00
parent e9b688e1f6 127838b6d3
commit ee68f3c9d0
187 changed files with 6193 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/posters/bs12.dm
+43 -3
View File
@@ -1,4 +1,4 @@
// baystation12 posters
// aurora station posters
/datum/poster/bay_1
icon_state="bsposter1"
name = "Unlucky Space Explorer"
@@ -286,5 +286,45 @@
/datum/poster/bay_58
icon_state="bsposter58"
name = "space carp information poster"
desc = "This poster showcases an old spacer saying on the dangers of migrant space carp."
name = "space bear information poster"
desc = "This poster displays a picture of a legendary space bear."
/datum/poster/bay_59
icon_state = "bsposter59"
name = "ATLAS poster"
desc = "ATLAS: For all of Humanity."
/datum/poster/bay_60
icon_state = "bsposter60"
name = "N.S.S. Aurora"
desc = "This poster is a picture of the old, now defunct, N.S.S. Aurora. Commissioned in 2454 and decommissioned in the early days of 2458."
/datum/poster/bay_61
icon_state = "bsposter61"
name = "Xenobiology Safety Protocols"
desc = "This posters warms the crew about the dangers of xenobiology outbreaks."
/datum/poster/bay_62
icon_state = "bsposter62"
name = "Xenobiology Division"
desc = "This one depicts a green skrell research director doing autopsy on an alien lifeform."
/datum/poster/bay_63
icon_state = "bsposter63"
name = "Suit Sensors"
desc = "This particular one depicts a female doctor tending to an injured crewmember. It says; \"Remember to enable your suit sensors!\"."
/datum/poster/bay_64
icon_state = "bsposter64"
name = "Maintenance Drones"
desc = "This particular one depicts a maintenance drone. It reminders the crew to don't disturb them when they are doing repairs."
/datum/poster/bay_65
icon_state = "bsposter65"
name = "Importance of Plasma"
desc = "A corporate morale poster showing three forms of plasma. Teaching the very basics of this really important substance."
/datum/poster/bay_66
icon_state = "bsposter66"
name = "BFG 9000"
desc = "A picture of a big freakin' gun."