shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7799 from R3dtail/new_carpet

Browse Source 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
This commit is contained in:
nik707
2018-12-10 16:45:38 -06:00
committed by GitHub
parent 1960947d25 4c7075f1a8
commit cae30f90ad
17 changed files with 108 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/cargo/packs.dm
View File

@@ -1486,16 +1486,24 @@
/datum/supply_pack/service/carpet
name = "Premium Carpet Crate"
desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together."
desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains the classics."
cost = 1000
contains = list(/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/red/fifty,
/obj/item/stack/tile/carpet/red/fifty,
/obj/item/stack/tile/carpet/black/fifty,
/obj/item/stack/tile/carpet/black/fifty)
crate_name = "premium carpet crate"
/datum/supply_pack/service/carpet2
name = "Premium Carpet Crate #2"
desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains red, and monochrome"
cost = 1000
contains = list(/obj/item/stack/tile/carpet/blackred/fifty,
/obj/item/stack/tile/carpet/blackred/fifty,
/obj/item/stack/tile/carpet/monochrome/fifty,
/obj/item/stack/tile/carpet/monochrome/fifty)
crate_name = "premium carpet crate #2"
/datum/supply_pack/service/lightbulbs
name = "Replacement Lights"
desc = "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs as well as a light replacer."

19
code/modules/clothing/under/accessories.dm
View File

@@ -139,7 +139,7 @@
SSblackbox.record_feedback("associative", "commendation", 1, list("commender" = "[user.real_name]", "commendee" = "[M.real_name]", "medal" = "[src]", "reason" = input))
GLOB.commendations += "[user.real_name] awarded <b>[M.real_name]</b> the <span class='medaltext'>[name]</span>! \n- [input]"
commended = TRUE
desc += "<br>The inscription reads: [input] - [user.real_name]"
desc += "<br>The inscription reads: [input] - [user.real_name]"
log_game("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
message_admins("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
@@ -157,6 +157,16 @@
desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
icon_state = "bronze_heart"
/obj/item/clothing/accessory/medal/engineer
name = "\"Shift's Best Electrician\" award"
desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds."
icon_state = "engineer"
/obj/item/clothing/accessory/medal/greytide
name = "\"Greytider of the shift\" award"
desc = "An award for only the most annoying of assistants. Locked doors mean nothing to you and behaving is not in your vocabulary"
icon_state = "greytide"
/obj/item/clothing/accessory/medal/ribbon
name = "ribbon"
desc = "A ribbon"
@@ -167,6 +177,11 @@
name = "\"cargo tech of the shift\" award"
desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
/obj/item/clothing/accessory/medal/ribbon/medical_doctor
name = "\"doctor of the shift\" award"
desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability"
icon_state = "medical_doctor"
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
desc = "A silver medal."
@@ -280,7 +295,7 @@
desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet."
icon_state = "lawyerbadge"
item_color = "lawyerbadge"
/obj/item/clothing/accessory/lawyers_badge/attack_self(mob/user)
if(prob(1))
user.say("The testimony contradicts the evidence!", forced = "attorney's badge")