Skip to content

Commit

Permalink
some tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
BigSlice committed Feb 26, 2018
1 parent d0aeded commit fc30405
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 15 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/lightreplacer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@
Emag()

/obj/item/device/lightreplacer/attack_self(mob/user)
/* // This would probably be a bit OP. If you want it though, uncomment the code.
// This would probably be a bit OP. If you want it though, uncomment the code.
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(R.emagged)
src.Emag()
usr << "You shortcircuit the [src]."
return
*/

usr << "It has [uses] lights remaining."

/obj/item/device/lightreplacer/update_icon()
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/weapons/handcuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@
if(ishuman(AM))
var/mob/living/carbon/H = AM
if(H.lying)
H.apply_damage(20,BRUTE,"chest")
H.apply_damage(50,BRUTE,"chest")
else
H.apply_damage(20,BRUTE,(pick("l_leg", "r_leg")))
H.apply_damage(50,BRUTE,(pick("l_leg", "r_leg")))
if(!H.legcuffed) //beartrap can't cuff you leg if there's already a beartrap or legcuffs.
H.legcuffed = src
src.loc = H
H.update_inv_legcuffed(0)
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.

else
L.apply_damage(20,BRUTE)
L.apply_damage(50,BRUTE)
..()
10 changes: 5 additions & 5 deletions code/modules/assembly/mousetrap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
L = H.get_organdatum(pick("l_leg", "r_leg"))
H.Weaken(3)
if("l_hand", "r_hand")
if(!H.gloves)
L = H.get_organdatum(type)
H.Stun(3)
L = H.get_organdatum(type)
H.Stun(3)
H.apply_damage(5,BRUTE,(type))
if(L && L.exists())
var/obj/item/organ/limb/affecting = L.organitem
if(affecting)
if(affecting.take_damage(1, 0))
if(affecting.take_damage(5, 0))
H.update_damage_overlays(0)
H.updatehealth()
else if(ismouse(target))
Expand Down Expand Up @@ -124,7 +124,7 @@
finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
"<span class='warning'>You accidentally trigger [src]!</span>")
triggered(finder, finder.hand ? "l_hand" : "r_hand")
return 1 //end the search!
//return 1 //end the search!
return 0


Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/mining_charge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
slot_flags = SLOT_BELT
var/detonating = 0 //If the charge is currently primed
var/safety = 1 //If the charge can be put on things other than rocks
var/explosionPower = 2 //The power of the explosion; larger powers = bigger boom
var/explosionPower = 3 //The power of the explosion; larger powers = bigger boom
var/atom/movable/putOn = null //The atom the charge is on
var/primedOverlay = null

Expand Down
6 changes: 3 additions & 3 deletions code/modules/power/lighting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -506,15 +506,15 @@
else if(istype(user) && user.dna.check_mutation(TK))
user << "You telekinetically remove the light [fitting]."
else
user << "You try to remove the light [fitting], but you burn your hand on it!"
user << "You remove the light [fitting], but you burn your hand on it!"

var/datum/organ/limb/L = H.get_organdatum("[user.hand ? "l" : "r" ]_arm")
if(L && L.exists())
var/obj/item/organ/limb/affecting = L.organitem
if(affecting.take_damage( 0, 5 )) // 5 burn damage
if(affecting.take_damage( 0, 10 )) // 10 burn damage
H.update_damage_overlays(0)
H.updatehealth()
return // if burned, don't remove the light
//return // if burned, don't remove the light
else
user << "You remove the light [fitting]."
// create a light tube/bulb item and put it in the user's hand
Expand Down
3 changes: 3 additions & 0 deletions config/admins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ BigSlice = Host
Sliceocelot = Host
Kubbrz6 = Midimin
M00nm4nhere = Midimin
Roleplay Rascal = Admin
SpaghettiScience = Midimin
Memeoo = Trial Admin
2 changes: 1 addition & 1 deletion config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ GUEST_BAN
# SERVER ss13.example.com:2506

## forum address
FORUMURL https://8ch.net/nt/index.html
FORUMURL ircs://irc.rizon.net:6697/#pizzastation

## Wiki address
WIKIURL http://8station.miraheze.org/
Expand Down
8 changes: 8 additions & 0 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@
-->
<div class="commit sansserif">
<h2 class="date">26 February 2018</h2>
<h3 class="author">BigSlice updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Buffed beartraps and mousetraps.</li>
<li class="tweak">Doubled mining charge blast radius.</li>
<li class="tweak">Lights can now be removed without gloves.</li>
<li class="tweak">Silicon light replacer can now be short-circuited.</li>
</ul>
<h2 class="date">23 February 2018</h2>
<h3 class="author">BigSlice updated:</h3>
<ul class="changes bgimages16">
Expand Down

0 comments on commit fc30405

Please sign in to comment.