cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflicts with weapon removals

Browse Source
This commit is contained in:
Kyep
2018-04-26 00:09:18 -07:00
parent 08fdc2bce3
commit c3f271449e
7 changed files with 887 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/folders.dm
+5 -5
View File
@@ -122,20 +122,20 @@
new /obj/item/documents/syndicate/blue(src)
update_icon()
/obj/item/weapon/folder/syndicate/yellow
/obj/item/folder/syndicate/yellow
icon_state = "folder_syellow"
/obj/item/weapon/folder/syndicate/yellow/New()
/obj/item/folder/syndicate/yellow/New()
..()
new /obj/item/documents/syndicate/yellow(src)
update_icon()
/obj/item/weapon/folder/syndicate/yellow_trapped
/obj/item/folder/syndicate/yellow_trapped
icon_state = "folder_syellow"
/obj/item/weapon/folder/syndicate/yellow_trapped/New()
/obj/item/folder/syndicate/yellow_trapped/New()
..()
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "'Yellow' secret documents"
P.info = "Death to NanoTrasen!"
P.contact_poison = "amanitin"