cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
2018-04-06 15:40:06 -04:00
parent dc3a587b7f d5c5249327
commit e08cbef044
59 changed files with 593 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/backpack.dm
+4 -4
View File
@@ -138,18 +138,18 @@
/obj/item/weapon/storage/backpack/dufflebag/syndie
name = "black dufflebag"
desc = "A large dufflebag for holding extra tactical supplies."
desc = "A large dufflebag for holding extra tactical supplies. This one appears to be made out of lighter material than usual."
icon_state = "duffle_syndie"
slowdown = 0
/obj/item/weapon/storage/backpack/dufflebag/syndie/med
name = "medical dufflebag"
desc = "A large dufflebag for holding extra tactical medical supplies."
desc = "A large dufflebag for holding extra tactical medical supplies. This one appears to be made out of lighter material than usual."
icon_state = "duffle_syndiemed"
/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
name = "ammunition dufflebag"
desc = "A large dufflebag for holding extra weapons ammunition and supplies."
desc = "A large dufflebag for holding extra weapons ammunition and supplies. This one appears to be made out of lighter material than usual."
icon_state = "duffle_syndieammo"
/obj/item/weapon/storage/backpack/dufflebag/captain
@@ -417,4 +417,4 @@
else
H.visible_message("<span class='notice'>\The [src] decides not to unpack \the [src]!</span>", \
"<span class='notice'>You decide not to unpack \the [src]!</span>")
return
return
code/game/objects/items/weapons/storage/fancy.dm
+4 -4
View File
@@ -107,10 +107,10 @@
if(istype(W,/obj/item/weapon/pen/crayon))
switch(W:colourName)
if("mime")
to_chat(usr,"This crayon is too sad to be contained in this box.")
to_chat(user, "This crayon is too sad to be contained in this box.")
return
if("rainbow")
to_chat(usr,"This crayon is too powerful to be contained in this box.")
to_chat(user, "This crayon is too powerful to be contained in this box.")
return
..()
@@ -149,10 +149,10 @@
if(istype(W,/obj/item/weapon/pen/crayon/marker))
switch(W:colourName)
if("mime")
to_chat(usr,"This marker is too depressing to be contained in this box.")
to_chat(user, "This marker is too depressing to be contained in this box.")
return
if("rainbow")
to_chat(usr,"This marker is too childish to be contained in this box.")
to_chat(user, "This marker is too childish to be contained in this box.")
return
..()
code/game/objects/items/weapons/storage/wallets.dm
+12 -1
View File
@@ -10,6 +10,9 @@
/obj/item/weapon/card,
/obj/item/clothing/mask/smokable/cigarette/,
/obj/item/device/flashlight/pen,
/obj/item/device/tape,
/obj/item/weapon/cartridge,
/obj/item/device/encryptionkey,
/obj/item/seeds,
/obj/item/stack/medical,
/obj/item/weapon/coin,
@@ -18,13 +21,21 @@
/obj/item/weapon/implanter,
/obj/item/weapon/flame/lighter,
/obj/item/weapon/flame/match,
/obj/item/weapon/forensics,
/obj/item/weapon/glass_extra,
/obj/item/weapon/haircomb,
/obj/item/weapon/hand,
/obj/item/weapon/key,
/obj/item/weapon/lipstick,
/obj/item/weapon/paper,
/obj/item/weapon/pen,
/obj/item/weapon/photo,
/obj/item/weapon/reagent_containers/dropper,
/obj/item/weapon/sample,
/obj/item/weapon/screwdriver,
/obj/item/weapon/stamp,
/obj/item/clothing/accessory/permit
/obj/item/clothing/accessory/permit,
/obj/item/clothing/accessory/badge
)
slot_flags = SLOT_ID