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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix

Browse Source
This commit is contained in:
Ccomp5950
2013-12-05 04:42:28 -06:00
parent 157b67404c ad4782babe
commit dd94adc765
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/Yinadele/Supermatter.dm
View File

@@ -202,6 +202,9 @@
/obj/machinery/power/supermatter/attack_robot(mob/user as mob)
return attack_hand(user)
/obj/machinery/power/supermatter/attack_ai(mob/user as mob)
user << "<span class = \"warning\">You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update.</span>"
/obj/machinery/power/supermatter/attack_hand(mob/user as mob)
user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\

1
code/modules/power/apc.dm
View File

@@ -800,6 +800,7 @@
if(!can_use(usr, 1))
return
src.add_fingerprint(usr)
if(usingUI) // If we set their machine and they're not using the UI, it'll cause the UI to pop up.
usr.set_machine(src)
if (href_list["apcwires"])
var/t1 = text2num(href_list["apcwires"])

25
html/changelog.html
View File

@@ -56,23 +56,10 @@ should be listed in the changelog upon commit though. Thanks. -->
<!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
<div class='commit sansserif'>
<h2 class='date'>23 November 2013</h2>
<h3 class='author'>Ccomp5950 updated:</h3>
<ul class='changes bgimages16'>
<li class='bugfix'>Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.</li>
<li class='bugfix'>Ghosts hit with the cult book shall now actually become visible.</li>
<li class='bugfix'>The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.</li>
<li class='bugfix'>Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.</li>
<li class='rscadd'>Atmospheric Technicians will now have access to Exterior airlocks.</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>24 November 2013</h2>
<h3 class='author'>Yinadele updated:</h3>
<ul class='changes bgimages16'>
<ul class='changes bgimages16'>
<li class='experiment'>Supermatter engine added! Please treat your new engine gently, and report any strangeness!</li>
<li class='tweak'>Rebalanced events so people don't explode into appendicitis or have their organs constantly explode.</li>
@@ -90,6 +77,18 @@ should be listed in the changelog upon commit though. Thanks. -->
<li class='experiment'>Please wait warmly, new features planned for next merge!</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>23 November 2013</h2>
<h3 class='author'>Ccomp5950 updated:</h3>
<ul class='changes bgimages16'>
<li class='bugfix'>Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.</li>
<li class='bugfix'>Ghosts hit with the cult book shall now actually become visible.</li>
<li class='bugfix'>The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.</li>
<li class='bugfix'>Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.</li>
<li class='rscadd'>Atmospheric Technicians will now have access to Exterior airlocks.</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>29 October 2013</h2>