mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-01 13:12:23 +00:00
c18a576136
Admin changes:
Admin attack logs now have a timestamps. Basically, before each log entry there is something that displays [hour:minute:second]. I plan on expanding this functionality to all kinds of logs, as well as creating a global attack log, but this will do for now.
Gloves:
You can still electrify any gloves with a power cell, however you have to use wires on non-insulated (yellow) gloves to create a "ghetto-insulation" system. I might make these gloves' stun effects more watered-down than normal insulated gloves, but that will probably be for later on.
Bugfixes:
Fixed some miscellaneous runtime errors, and more importantly, the shotgun. You can dry-pump it by clicking on it, which will eject any used shots or just make that badass "chuck-chick" sound to let everyone know you mean business. Combat shotguns can now shoot twice without the need to pump.
I also possibly fixed the issue with metroids' AI process locking up. Someone's going to have to PM me on the forums to tell me if this worked or not, because I have not been able to reproduce the bug (although I do know where it's happening in the code).
Chemistry:
Alright, so this is where the meat of this update is. In a previous revision (r1905) I mentioned the addition of a new "color" variable. This variable now has a use. When you use a spray cleaner, or a chem sprayer which now is significantly more powerful, the color combination of all the reagents inside the sprayer will be displayed instead of the plain old blue-white color. This will allow for people to easily distinguish reagents and colors, for instance, if you see some chemist running around spraying orange or purple stuff chances are that's acid he's spraying, so you should probably subdue him!
In addition, you will now be able to see beakers (large ones too) fill up visually. The color of the reagents inside the beaker is overlayed on top of the beaker. The colors may be subject to change to make them brighter or more easily identifiable by "category". Currently, most pharmaceuticals have a light pinkish color. Polytrinic acid has a distinct purple color, etc. However, with due time I can picture chemists mixing other, benign-ish reagents with harmful reagents so passerbys think that a chemist is spraying someone with something harmless, but in reality is spraying them with a bunch of PAcid. There are some consequences, for instance, concentrated acid is more powerful than watered-down acid.
Have fun with that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1922 316c924e-a436-60f5-8080-3fe189b3f50e
194 lines
5.8 KiB
Plaintext
194 lines
5.8 KiB
Plaintext
/*
|
|
CONTAINS:
|
|
PAINT
|
|
DNA INJECTOR
|
|
|
|
*/
|
|
var/global/list/cached_icons = list()
|
|
|
|
/obj/item/weapon/paint/red
|
|
name = "Red paint"
|
|
color = "FF0000"
|
|
icon_state = "paint_red"
|
|
|
|
/obj/item/weapon/paint/green
|
|
name = "Green paint"
|
|
color = "00FF00"
|
|
icon_state = "paint_green"
|
|
|
|
/obj/item/weapon/paint/blue
|
|
name = "Blue paint"
|
|
color = "0000FF"
|
|
icon_state = "paint_blue"
|
|
|
|
/obj/item/weapon/paint/yellow
|
|
name = "Yellow paint"
|
|
color = "FFFF00"
|
|
icon_state = "paint_yellow"
|
|
|
|
/obj/item/weapon/paint/violet //no icon
|
|
name = "Violet paint"
|
|
color = "FF00FF"
|
|
icon_state = "paint_neutral"
|
|
|
|
/obj/item/weapon/paint/black
|
|
name = "Black paint"
|
|
color = "333333"
|
|
icon_state = "paint_black"
|
|
|
|
/obj/item/weapon/paint/white
|
|
name = "White paint"
|
|
color = "FFFFFF"
|
|
icon_state = "paint_white"
|
|
|
|
|
|
/obj/item/weapon/paint/anycolor
|
|
name = "Any color"
|
|
icon_state = "paint_neutral"
|
|
|
|
attack_self(mob/user as mob)
|
|
var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "black", "white")
|
|
if ((user.equipped() != src || user.stat || user.restrained()))
|
|
return
|
|
switch(t1)
|
|
if("red")
|
|
color = "FF0000"
|
|
if("blue")
|
|
color = "0000FF"
|
|
if("green")
|
|
color = "00FF00"
|
|
if("yellow")
|
|
color = "FFFF00"
|
|
/*
|
|
if("violet")
|
|
color = "FF00FF"
|
|
*/
|
|
if("white")
|
|
color = "FFFFFF"
|
|
if("black")
|
|
color = "333333"
|
|
icon_state = "paint_[t1]"
|
|
add_fingerprint(user)
|
|
return
|
|
|
|
|
|
/obj/item/weapon/paint/afterattack(turf/target, mob/user as mob)
|
|
if(!istype(target) || istype(target, /turf/space))
|
|
return
|
|
var/ind = "[initial(target.icon)][color]"
|
|
if(!cached_icons[ind])
|
|
var/icon/overlay = new/icon(initial(target.icon))
|
|
overlay.Blend("#[color]",ICON_MULTIPLY)
|
|
overlay.SetIntensity(1.4)
|
|
target.icon = overlay
|
|
cached_icons[ind] = target.icon
|
|
else
|
|
target.icon = cached_icons[ind]
|
|
return
|
|
|
|
/obj/item/weapon/paint/paint_remover
|
|
name = "Paint remover"
|
|
icon_state = "paint_neutral"
|
|
|
|
afterattack(turf/target, mob/user as mob)
|
|
if(istype(target) && target.icon != initial(target.icon))
|
|
target.icon = initial(target.icon)
|
|
return
|
|
|
|
|
|
/obj/item/weapon/dnainjector/attack_paw(mob/user as mob)
|
|
return attack_hand(user)
|
|
|
|
|
|
/obj/item/weapon/dnainjector/proc/inject(mob/M as mob)
|
|
M.radiation += rand(20,50)
|
|
if (dnatype == "ui")
|
|
if (!block) //isolated block?
|
|
if (ue) //unique enzymes? yes
|
|
M.dna.uni_identity = dna
|
|
updateappearance(M, M.dna.uni_identity)
|
|
M.real_name = ue
|
|
M.name = ue
|
|
uses--
|
|
else //unique enzymes? no
|
|
M.dna.uni_identity = dna
|
|
updateappearance(M, M.dna.uni_identity)
|
|
uses--
|
|
else
|
|
M.dna.uni_identity = setblock(M.dna.uni_identity,block,dna,3)
|
|
updateappearance(M, M.dna.uni_identity)
|
|
uses--
|
|
if (dnatype == "se")
|
|
if (!block) //isolated block?
|
|
M.dna.struc_enzymes = dna
|
|
domutcheck(M, null)
|
|
uses--
|
|
else
|
|
M.dna.struc_enzymes = setblock(M.dna.struc_enzymes,block,dna,3)
|
|
domutcheck(M, null,1)
|
|
uses--
|
|
|
|
spawn(0)//this prevents the collapse of space-time continuum
|
|
del(src)
|
|
return uses
|
|
|
|
/obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)
|
|
if (!istype(M, /mob))
|
|
return
|
|
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
|
|
user << "\red You don't have the dexterity to do this!"
|
|
return
|
|
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
|
|
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to inject [M.name] ([M.ckey])</font>")
|
|
|
|
if (user)
|
|
if (istype(M, /mob/living/carbon/human))
|
|
var/obj/equip_e/human/O = new /obj/equip_e/human( )
|
|
O.source = user
|
|
O.target = M
|
|
O.item = src
|
|
O.s_loc = user.loc
|
|
O.t_loc = M.loc
|
|
O.place = "dnainjector"
|
|
M.requests += O
|
|
if (dnatype == "se")
|
|
if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)")
|
|
else
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
|
else
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
|
|
|
spawn( 0 )
|
|
O.process()
|
|
return
|
|
else
|
|
for(var/mob/O in viewers(M, null))
|
|
O.show_message(text("\red [] has been injected with [] by [].", M, src, user), 1)
|
|
//Foreach goto(192)
|
|
if (!(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)))
|
|
user << "\red Apparently it didn't work."
|
|
return
|
|
if (dnatype == "se")
|
|
if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)")
|
|
else
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
|
else
|
|
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
|
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
|
inject(M)//Now we actually do the heavy lifting.
|
|
/*
|
|
A user injecting themselves could mean their own transformation and deletion of mob.
|
|
I don't have the time to figure out how this code works so this will do for now.
|
|
I did rearrange things a bit.
|
|
*/
|
|
if(!isnull(user))//If the user still exists. Their mob may not.
|
|
user.show_message(text("\red You inject [M]"))
|
|
return
|