Fixes #5055
Fixes #5053
This commit is contained in:
Ron
2018-07-29 13:38:00 +03:00
committed by Erki
parent 0de5936ac1
commit 09ba14ccbf
3 changed files with 45 additions and 5 deletions
+1 -1
View File
@@ -228,7 +228,7 @@
access = list(access_journalist, access_maint_tunnels)
minimal_access = list(access_journalist, access_maint_tunnels)
alt_titles = list("Freelance Journalist")
title_accesses = list("Corporate Reporter" = list(access_medical, access_security, access_research, access_engine))
title_accesses = list("Corporate Reporter" = list(access_medical, access_sec_doors, access_research, access_engine))
/datum/job/journalist/equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H)
+6 -4
View File
@@ -122,12 +122,14 @@
if(do_after(user, 40, act_target = src))
if(!stored_item)
to_chat(user,"<span class='notice'>There is nothing hidden in [src].</span>")
return
else
user.put_in_hands(stored_item)
to_chat(user,"<span class='notice'>You take \the [stored_item] from [src].</span>")
if(istype(stored_item, /obj/item/device/paicard))
stored_item.forceMove(src.loc)
to_chat(user,"<span class='notice'>You reveal \the [stored_item] from [src].</span>")
else
user.put_in_hands(stored_item)
to_chat(user,"<span class='notice'>You take \the [stored_item] from [src].</span>")
stored_item = null
return
/obj/structure/flora/pottedplant/bullet_act(var/obj/item/projectile/Proj)
if (prob(Proj.damage*2))
+38
View File
@@ -0,0 +1,38 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Ron
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Corporate Reporters can now access security."
- bugfix: "Removing a pAI from the potted plant no longer results in two being dropped."