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

In-hand items should now properly update when equipping items.

Browse Source 
The singularity can no longer stunlock dead or unconscious people.

tgstation.dme updated since one of the files were removed

Changelog updated to put the 'have a bug to report?' bit to a spot just above where coders put their changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4521 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-08-23 04:13:37 +00:00
parent 1a8fb7c09e
commit 4b2326388c
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/screen.dm
View File

@@ -550,10 +550,14 @@
/obj/screen/inventory/attack_hand(mob/user as mob)
user.attack_ui(slot_id)
user.update_inv_l_hand(0)
user.update_inv_r_hand()
return
/obj/screen/inventory/attack_paw(mob/user as mob)
user.attack_ui(slot_id)
user.update_inv_l_hand(0)
user.update_inv_r_hand()
return

2
code/modules/power/singularity/singularity.dm
View File

@@ -417,7 +417,7 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/proc/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
if(istype(M,/mob/living/carbon/human))
if(istype(M,/mob/living/carbon/human) && M.stat == CONSCIOUS)
if(istype(M:glasses,/obj/item/clothing/glasses/meson))
M << "\blue You look directly into The [src.name], good thing you had your protective eyewear on!"
return

8
html/changelog.html
View File

@@ -36,7 +36,9 @@
<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom<br></font>
<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut<br></font>
<font size='2'><b>Sounds:</b> Skie, Lasty/Vinyl<br></font>
<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image</font>
<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image<br></font>
<font size='2' color='red'><b><br>Have a bug to report?</b> Visit our <a href="http://code.google.com/p/tgstation13/issues/list">Issue Tracker</a>.<br></font>
<font size='2'>Please ensure that the bug has not already been reported and <u>use the template provided</u>.</font>
</td>
</tr>
</table>
@@ -47,10 +49,10 @@ should be listed in the changelog upon commit tho. 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">
<h2 class="date">August 21, 2012</h2>
<h2 class="date">August 23, 2012</h2>
<h3 class="author">Nodrak updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Have a bug to report? Visit: http://code.google.com/p/tgstation13/issues/list<br>Please ensure that the bug has not already been reported and <u>use the template provided</u>.</li>
<li class="bugfix">In-hand sprites once again update correctly when equipping items.</li>
</ul>
</div>

1
tgstation.dme
View File

@@ -748,7 +748,6 @@
#include "code\game\vehicles\airtight\airtight.dm"
#include "code\game\vehicles\airtight\land.dm"
#include "code\game\vehicles\airtight\space.dm"
#include "code\game\verbs\AI_status.dm"
#include "code\game\verbs\ooc.dm"
#include "code\game\verbs\sound.dm"
#include "code\game\verbs\suicide.dm"