cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-06-05 10:23:23 +02:00
parent c21985f39d e44a4805f2
commit 7f9996eece
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/stacks/stack.dm
View File

@@ -255,6 +255,7 @@
var/orig_amount = src.amount var/orig_amount = src.amount
if (transfer && src.use(transfer)) if (transfer && src.use(transfer))
var/obj/item/stack/newstack = new src.type(loc, transfer) var/obj/item/stack/newstack = new src.type(loc, transfer)
newstack.color = color
if (prob(transfer/orig_amount * 100)) if (prob(transfer/orig_amount * 100))
transfer_fingerprints_to(newstack) transfer_fingerprints_to(newstack)
if(blood_DNA) if(blood_DNA)

4
code/game/verbs/who.dm
View File

@@ -112,6 +112,8 @@
else if (R_MOD & C.holder.rights || R_MENTOR & C.holder.rights) else if (R_MOD & C.holder.rights || R_MENTOR & C.holder.rights)
modmsg += "\t[C] is a [C.holder.rank]\n" modmsg += "\t[C] is a [C.holder.rank]\n"
num_mods_online++ num_mods_online++
if(config.admin_irc)
src << "<span class='info'>Adminhelps are also sent to IRC. If no admins are available in game try anyway and an admin on IRC may see it and respond.</span>"
msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg + "\n<b> Current [config.mods_are_mentors ? "Mentors" : "Moderators"]([num_mods_online]):</b>\n" + modmsg msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg + "\n<b> Current [config.mods_are_mentors ? "Mentors" : "Moderators"]([num_mods_online]):</b>\n" + modmsg
src << msg src << msg

11
code/modules/power/cable.dm
View File

@@ -612,6 +612,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
// Items usable on a cable coil : // Items usable on a cable coil :
// - Wirecutters : cut them duh ! // - Wirecutters : cut them duh !
// - Cable coil : merge cables // - Cable coil : merge cables
/obj/item/stack/cable_coil/proc/can_merge(var/obj/item/stack/cable_coil/C)
return color == C.color
/obj/item/stack/cable_coil/cyborg/can_merge()
return 1
/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user) /obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user)
..() ..()
if( istype(W, /obj/item/weapon/wirecutters) && src.get_amount() > 1) if( istype(W, /obj/item/weapon/wirecutters) && src.get_amount() > 1)
@@ -622,6 +628,11 @@ obj/structure/cable/proc/cableColor(var/colorC)
return return
else if(istype(W, /obj/item/stack/cable_coil)) else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W var/obj/item/stack/cable_coil/C = W
if(!can_merge(C))
user << "These coils do not go together."
return
if(C.get_amount() >= get_max_amount()) if(C.get_amount() >= get_max_amount())
user << "The coil is too long, you cannot add any more cable to it." user << "The coil is too long, you cannot add any more cable to it."
return return

6
html/changelogs/PsiOmegaDelta-StackFixes.yml Normal file
View File

@@ -0,0 +1,6 @@
author: PsiOmegaDelta
delete-after: True
changes:
- bugfix: "Split stacks no longer lose their coloring."
- tweak: "Can no longer merge cables of different colors."