New sprites for bomb suit, in-hands for pulse rifles, advances energy guns, and laser guns. Customs for sicktrigger, lexusjjss, and roaper. Changes to the MOTD to match the server and remove the changelog link.

code/modules/clothing/suits/bomb.dm

@@ -1,14 +1,14 @@
 /obj/item/clothing/head/bomb_hood
 	name = "bomb hood"
-	desc = "Use in case of bomb."
+	desc = "A hood that protect from explosions. Also provides moderate protection."
 	icon_state = "bombsuit"
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
 /obj/item/clothing/suit/bomb_suit
 	name = "bomb suit"
-	desc = "A suit designed for safety when handling explosives."
+	desc = "A suit used for safely disposing explosives. Also provides moderate protection."
 	icon_state = "bombsuit"
 	item_state = "bombsuit"
 	w_class = 4//bulky item
@@ -17,8 +17,8 @@
 	heat_transfer_coefficient = 0.30
 	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	slowdown = 2
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
+	slowdown = 3.5 //To compensate for the extra armour.
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 100, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT
 
 

code/modules/customitems/item_defines.dm

@@ -46,6 +46,12 @@
 	icon_state = "steve_johnson_1"
 	item_state = "steve_johnson_1"
 
+/obj/item/fluff/david_fanning_1 //sicktrigger: David Fanning
+	name = "golden scalpel"
+	desc = "A fine surgical cutting tool covered in thin gold leaf. Does not seem able to cut anything."
+	icon_state = "david_fanning_1"
+	item_state = "david_fanning_1"
+
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
@@ -118,13 +124,19 @@
 	icon_state = "orangecamera"
 	pictures_left = 30
 
-
 /obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have
 	name = "Lifetime ID Card"
 	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of NanoTrasen. It sparkles blue."
 	icon = 'custom_items.dmi'
 	icon_state = "lifetimeid"
 
+/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask //lexusjjss: Lexus Langg & Zachary Tomlinson
+	name = "shiny flask"
+	desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it."
+	icon = 'custom_items.dmi'
+	icon_state = "shinyflask"
+	volume = 50
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -176,6 +188,13 @@
 	icon = 'custom_items.dmi'
 	icon_state = "taryn_kifer_1"
 
+/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai
+	name = "comfy cap"
+	desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
+	icon = 'custom_items.dmi'
+	icon_state = "enos_adlai_1"
+	flags = FPRINT|TABLEPASS
+
 //////////// Suits ////////////
 
 /obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber

code/modules/projectiles/guns/energy/laser.dm

@@ -1,8 +1,8 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser gun"
-	desc = "a basic weapon designed kill with concentrated energy bolts"
+	desc = "A basic weapon designed kill with concentrated energy bolts."
 	icon_state = "laser"
-	item_state = "laser"
+	item_state = "laser100"
 	fire_sound = 'Laser.ogg'
 	w_class = 3.0
 	m_amt = 2000
@@ -23,8 +23,9 @@ obj/item/weapon/gun/energy/laser/retro
 
 
 /obj/item/weapon/gun/energy/laser/captain
-	icon_state = "caplaser"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
+	icon_state = "caplaser"
+	item_state = "laser"
 	force = 10
 	origin_tech = null
 	var/charge_tick = 0
@@ -71,6 +72,7 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser cannon"
 	desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
 	icon_state = "lasercannon"
+	item_state = "laser100"
 	fire_sound = 'lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"

code/modules/projectiles/guns/energy/nuclear.dm

@@ -42,6 +42,7 @@
 	origin_tech = "combat=3;materials=5;powerstorage=3"
 	var/lightfail = 0
 	icon_state = "nucgun"
+	item_state = "nucgun100"
 	var/charge_tick = 0
 
 	New()

code/modules/projectiles/guns/energy/pulse.dm

@@ -2,6 +2,7 @@
 	name = "\improper Pulse Rifle"
 	desc = "A heavy-duty, pulse-based energy weapon, preferred by front-line combat personnel."
 	icon_state = "pulse"
+	item_state = "pulse100"
 	force = 10
 	fire_sound = 'pulse.ogg'
 	charge_cost = 200
@@ -50,6 +51,7 @@
 	name = "\improper M1911-P"
 	desc = "It's not the size of the gun, it's the size of the hole it puts through people."
 	icon_state = "m1911-p"
+	item_state = "gun"
 	cell_type = "/obj/item/weapon/cell/infinite"
 
 

config/custom_items.txt

@@ -3,28 +3,31 @@ atomicdog92: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/leather
 chinsky: Victor Kaminski: /obj/item/fluff/victor_kaminsky_1
 chinsky: Summer Springfield: /obj/item/weapon/camera_test/fluff/orange
 compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
+desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform
+desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform
 deusdactyl: Greg Anderson: /obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1
 deusdactyl: Roger Wiles: /obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit, /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
 deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
 erthilo: Farah Lants: /obj/item/clothing/under/rank/medical/fluff/short, /obj/item/clothing/suit/storage/labcoat/fluff/red
+fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetime
+fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
+fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
 leonheart11:  Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
-lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote
-lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote
+lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
+lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
 madmalicemccrea: Alice McCrea: /obj/item/clothing/head/helmet/welding/fluff/alice_mccrea_1
 mangled: Li Tsun: /obj/item/weapon/lighter/zippo/fluff/li_tsun_1
 misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
 morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
 orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen
 orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
-fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
-fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
-desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform
-desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform
+roaper: Enos Adlai: /obj/item/clothing/head/fluff/enos_adlai_1
 searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/helmet/welding/fluff/yuki_matsuda_1
 searif: Tsiokeriio Tarbell: /obj/item/clothing/mask/fluff/flagmask
 serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /obj/item/clothing/shoes/fluff/leatherboots
+sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1
 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/storage/labcoat/fluff/pink
 sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
@@ -34,5 +37,4 @@ thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
 themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
-whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetimeid
+whitellama: Ethan Way: /obj/item/fluff/ethan_way_1

config/motd.txt

@@ -1,11 +1,9 @@
-<h1>Welcome to Space Station 13!</h1>
+<h1>Welcome to Baystation 12!</h1>
 
-<i>This server is running Baystation 12's modification of the /tg/station13 code.</i>
+<i>This server is running <a href="http://baystation12.net/">Baystation 12's</a> modification of the <a href="http://nanotrasen.com/">/tg/station13</a> code.</i>
 <br><br>
 <strong>Bugtracker:</strong> <a href="https://github.com/Baystation12/Baystation12/issues">https://github.com/Baystation12/Baystation12/issues</a>
 <br>
-<strong>Changelog:</strong> <a href="http://baystation12.net/wiki/index.php/Changelog">http://baystation12.net/wiki/index.php/Changelog</a> or the Changelog command.
-<br>
-<strong>Rules:</strong> <a href="http://baystation12.net/wiki/index.php/Rules">http://baystation12.net/wiki/index.php/Rules</a> or the Rules command.
+<strong>Rules and Roleplaying Tips:</strong> <a href="http://baystation12.net/wiki/index.php/Rules">http://baystation12.net/wiki/index.php/Rules</a> or the Rules command.
 <br><br>
-By playing you agree to read and abide by the rules!
+This is a roleplaying server, so don't forget to remain in character when not in OOC. By playing you agree to have read and abide by the rules!