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

Merge branch 'master' into glassware

Browse Source
This commit is contained in:
TrilbySpaceClone
2019-12-07 12:50:32 -05:00
parent 82ab55453b cece6dd43d
commit e5c8f7bf06
932 changed files with 16815 additions and 10794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/bounties/assistant.dm
+3 -3
View File
@@ -201,10 +201,10 @@
wanted_types = list(/obj/item/restraints/legcuffs/bola)
/datum/bounty/item/assistant/metalshields
name = "Metal Shields"
name = "Metal Shields" //I didnt realise how much work it was to make these, you need 2 Cloth, 3 Leather, Tools, 10 Metal, and a Cable Coil Stack for each one.
description = "NT is testing the effects of electricity on clowns wielding metal shields. We have clowns, and we have electricity. Send us the shields."
reward = 1400
required_count = 4
reward = 3000
required_count = 2
wanted_types = list(/obj/item/shield/makeshift)
/datum/bounty/item/assistant/toolbelts