cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

Browse Source 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-03-15 22:41:14 -04:00
parent cba2d187bc 8d0434eb61
commit a0de41f24f
242 changed files with 21216 additions and 547364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+6 -2
View File
@@ -457,6 +457,10 @@
update_icon()
/obj/item/weapon/paper/get_worn_icon_state(var/slot_name)
if(slot_name == slot_head_str)
return "paper" //Gross, but required for now.
return ..()
/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob)
..()
@@ -495,13 +499,13 @@
B.loc = h_user
B.hud_layerise()
h_user.l_store = B
h_user.update_inv_pockets()
//h_user.update_inv_pockets() //Doesn't do anything
else if (h_user.r_store == src)
h_user.drop_from_inventory(src)
B.loc = h_user
B.hud_layerise()
h_user.r_store = B
h_user.update_inv_pockets()
//h_user.update_inv_pockets() //Doesn't do anything
else if (h_user.head == src)
h_user.u_equip(src)
h_user.put_in_hands(B)
code/modules/paperwork/paper_bundle.dm
+4 -4
View File
@@ -164,7 +164,7 @@
usr.put_in_hands(W)
pages.Remove(pages[page])
usr << "<span class='notice'>You remove the [W.name] from the bundle.</span>"
to_chat(usr, "<span class='notice'>You remove the [W.name] from the bundle.</span>")
if(pages.len <= 1)
var/obj/item/weapon/paper/P = src[1]
@@ -178,11 +178,11 @@
page = pages.len
update_icon()
else
usr << "<span class='notice'>You need to hold it in hands!</span>"
if (src.loc && istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
src.attack_self(usr)
updateUsrDialog()
else
to_chat(usr, "<span class='notice'>You need to hold it in hands!</span>")
/obj/item/weapon/paper_bundle/verb/rename()
set name = "Rename bundle"