cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2705 from jediluke69/bleeding-edge-freeze

Browse Source 
less robusty nanopaste
This commit is contained in:
Jim "Apples"
2013-04-25 10:47:30 -07:00
parent 51f438dfdb d9d09f7b1d
commit b2cecc5028
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/stacks/nanopaste.dm
View File

@@ -14,8 +14,8 @@
if (istype(M,/mob/living/silicon/robot)) //Repairing cyborgs if (istype(M,/mob/living/silicon/robot)) //Repairing cyborgs
var/mob/living/silicon/robot/R = M var/mob/living/silicon/robot/R = M
if (R.getBruteLoss() || R.getFireLoss() ) if (R.getBruteLoss() || R.getFireLoss() )
R.adjustBruteLoss(-60) R.adjustBruteLoss(-15)
R.adjustFireLoss(-60) R.adjustFireLoss(-15)
R.updatehealth() R.updatehealth()
use(1) use(1)
user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\ user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\
@@ -28,7 +28,7 @@
var/datum/organ/external/S = H.get_organ(user.zone_sel.selecting) var/datum/organ/external/S = H.get_organ(user.zone_sel.selecting)
if (S && (S.status & ORGAN_ROBOT)) if (S && (S.status & ORGAN_ROBOT))
if(S.get_damage()) if(S.get_damage())
S.heal_damage(30, 30, robo_repair = 1) S.heal_damage(15, 15, robo_repair = 1)
H.updatehealth() H.updatehealth()
use(1) use(1)
user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].</span>",\ user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].</span>",\

12
html/changelog.html
View File

@@ -57,7 +57,17 @@ Stuff which is in development and not yet visible to players or just code relate
(ie. code improvements for expandability, etc.) should not be listed here. They (ie. code improvements for expandability, etc.) should not be listed here. They
should be listed in the changelog upon commit though. Thanks. --> should be listed in the changelog upon commit though. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here --><div class="commit sansserif"> <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here --><div class="commit sansserif">
<h2 class="date">April 24, 2013</h2>
<h3 class="author">Jediluke69 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added 5 new drinks (Kira Special, Lemonade, Brown Star, Milkshakes, Rewriter)</li>
<li class="tweak">Nanopaste now heals about half of what it used to</li>
<li class="tweak">Ballistic crates should now come with shotguns loaded with actual shells no more beanbags</li>
<li class="bugfix">Iced tea no longer makes a glass of .what?</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">April 24, 2013</h2> <h2 class="date">April 24, 2013</h2>
<h3 class="author">faux updated:</h3> <h3 class="author">faux updated:</h3>
<ul class="changes bgimages16"> <ul class="changes bgimages16">