diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index ff782f10438..c1420e12dc9 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -676,7 +676,6 @@ /obj/item/clothing/under/overalls = 1, /obj/item/clothing/under/redcoat = 0.5, /obj/item/clothing/under/serviceoveralls = 1, - /obj/item/clothing/under/psyche = 0.5, /obj/item/clothing/under/rank/dispatch = 0.8, /obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/under/syndicate/tracksuit = 0.2, diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index b603c320a67..31ea9756522 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -684,17 +684,17 @@ var/list/global/random_stock_large = list( var/list/allgloves = typesof(/obj/item/clothing/gloves) var/list/exclusion = list(/obj/item/clothing/gloves, - /obj/item/clothing/gloves/fluff, - /obj/item/clothing/gloves/black/fluff, - /obj/item/clothing/gloves/white/unathi/fluff, /obj/item/clothing/gloves/swat/bst, - /obj/item/clothing/gloves/swat/fluff, /obj/item/clothing/gloves/black/fluff, /obj/item/clothing/gloves/powerfist, /obj/item/clothing/gloves/claws) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) exclusion += typesof(/obj/item/clothing/gloves/watch) + exclusion += typesof(/obj/item/clothing/gloves/swat/fluff) + exclusion += typesof(/obj/item/clothing/gloves/black/fluff) + exclusion += typesof(/obj/item/clothing/gloves/white/unathi/fluff) + exclusion += typesof(/obj/item/clothing/gloves/fluff) allgloves -= exclusion var/number = rand(1,5) while (number > 0) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 5f0e3749c11..1644aa9d315 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2265,4 +2265,45 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. new /obj/item/fluff/yarn/blue(src) new /obj/item/fluff/yarn/green(src) new /obj/item/fluff/yarn/purple(src) - new /obj/item/fluff/yarn/yellow(src) \ No newline at end of file + new /obj/item/fluff/yarn/yellow(src) + + +/obj/item/clothing/under/fluff/moyers_shirt //Custom Martian Raider T-Shirt - Caiden Moyers - tylaaaar + name = "custom martian raider t-shirt" + desc = "A Martian Raider Spaceball T-shirt with the name \"MOYERS\" written on the back in plain white text." + icon = 'icons/obj/custom_items/moyers_shirt.dmi' + icon_state = "moyers_shirt" + item_state = "moyers_shirt" + contained_sprite = TRUE + + +/obj/item/clothing/suit/fluff/eri_robes //Senior Alchemist Robes - Eri Akhandi - paradoxspace + name = "senior alchemist robes" + desc = "A green set of robes, trimmed with what appears to be real gold. Looking at the necklace, you can see the alchemical symbol for the Philosopher's Stone, made of ruby." + icon = 'icons/obj/custom_items/eri_robes.dmi' + icon_state = "eri_robes" + item_state = "eri_robes" + contained_sprite = TRUE + + +/obj/item/fluff/halstere_card //Solarian Alliance Military ID - Kalren Halstere - brutishcrab51 + name = "solarian alliance military ID" + desc = "A green and white military identification card, with an Alliance of Sovereign Solarian Nations sigil stamped on the front." + icon = 'icons/obj/custom_items/halstere_clothing.dmi' + icon_state = "halstere_card" + w_class = 2 + var/flipped = FALSE + +/obj/item/fluff/halstere_card/attack_self(mob/user as mob) + flipped = !flipped + queue_icon_update() + +/obj/item/fluff/halstere_card/update_icon() + if(flipped) + icon_state = "halstere_card_open" + else + icon_state = initial(icon_state) + +/obj/item/fluff/halstere_card/examine(mob/user) + if(..(user, 1) && flipped) + to_chat(user, "The name 'Halstere, Kalren C.' is stamped on it. An expiration date is listed on it, '2465JAN01'. A pay grade is listed beside the name. 'MAJ/O4'. A number is listed under the expiration date: '14015236810'.") \ No newline at end of file diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 2859e1d091f..7baa4d31f70 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -63,7 +63,7 @@ for(var/datum/computer_file/program/P in idle_threads) P.event_idremoved(1) - card_slot.stored_card.forceMove(get_turf(src)) + user.put_in_hands(card_slot.stored_card) card_slot.stored_card = null update_uis() to_chat(user, "You remove the card from \the [src]") @@ -88,7 +88,7 @@ to_chat(user, "There is no intellicard connected to \the [src].") return - ai_slot.stored_card.forceMove(get_turf(src)) + user.put_in_hands(ai_slot.stored_card) ai_slot.stored_card = null ai_slot.update_power_usage() update_uis() diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm index 9b1e8a994fc..7ba6c4ce5c8 100644 --- a/code/modules/multiz/turfs/open_space.dm +++ b/code/modules/multiz/turfs/open_space.dm @@ -120,7 +120,7 @@ . = ..() icon_state = "Fill" -/turf/simulated/open/airless/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/open/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/basalt.dmi' underlay_appearance.icon_state = "basalt" if (prob(20)) diff --git a/html/changelog.html b/html/changelog.html index fe3aabae566..e8b6afeb282 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,18 @@ -->
+

16 June 2018

+

Arrow768 updated:

+ + +

10 June 2018

+

Arrow768 updated:

+ +

03 June 2018

BurgerBB updated: