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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ores_coins.dm
+10 -10
View File
@@ -14,7 +14,7 @@
new refined_type(get_turf(src.loc))
qdel(src)
else if(W.isOn())
user << "<span class='info'>Not enough fuel to smelt [src].</span>"
to_chat(user, "<span class='info'>Not enough fuel to smelt [src].</span>")
..()
/obj/item/weapon/ore/Crossed(atom/movable/AM)
@@ -73,7 +73,7 @@
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/ore/glass/attack_self(mob/living/user)
user << "<span class='notice'>You use the sand to make sandstone.</span>"
to_chat(user, "<span class='notice'>You use the sand to make sandstone.</span>")
var/sandAmt = 1
for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor
sandAmt += 1
@@ -107,7 +107,7 @@
C.adjust_blurriness(6)
C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
C.confused += 5
C << "<span class='userdanger'>\The [src] gets into your eyes! The pain, it burns!</span>"
to_chat(C, "<span class='userdanger'>\The [src] gets into your eyes! The pain, it burns!</span>")
qdel(src)
/obj/item/weapon/ore/glass/basalt
@@ -126,7 +126,7 @@
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding)
user << "<span class='warning'>You can't hit a high enough temperature to smelt [src] properly!</span>"
to_chat(user, "<span class='warning'>You can't hit a high enough temperature to smelt [src] properly!</span>")
else
..()
@@ -309,7 +309,7 @@
/obj/item/weapon/coin/examine(mob/user)
..()
if(value)
user << "<span class='info'>It's worth [value] credit\s.</span>"
to_chat(user, "<span class='info'>It's worth [value] credit\s.</span>")
/obj/item/weapon/coin/gold
cmineral = "gold"
@@ -386,15 +386,15 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
if(string_attached)
user << "<span class='warning'>There already is a string attached to this coin!</span>"
to_chat(user, "<span class='warning'>There already is a string attached to this coin!</span>")
return
if (CC.use(1))
add_overlay(image('icons/obj/economy.dmi',"coin_string_overlay"))
string_attached = 1
user << "<span class='notice'>You attach a string to the coin.</span>"
to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
else
user << "<span class='warning'>You need one length of cable to attach a string to the coin!</span>"
to_chat(user, "<span class='warning'>You need one length of cable to attach a string to the coin!</span>")
return
else if(istype(W,/obj/item/weapon/wirecutters))
@@ -407,13 +407,13 @@
CC.update_icon()
overlays = list()
string_attached = null
user << "<span class='notice'>You detach the string from the coin.</span>"
to_chat(user, "<span class='notice'>You detach the string from the coin.</span>")
else ..()
/obj/item/weapon/coin/attack_self(mob/user)
if(cooldown < world.time - 15)
if(string_attached) //does the coin have a wire attached
user << "<span class='warning'>The coin won't flip very well with something attached!</span>" //Tell user it will not flip
to_chat(user, "<span class='warning'>The coin won't flip very well with something attached!</span>" )
return //do not flip the coin
var/coinflip = pick(sideslist)
cooldown = world.time