mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
- Fixed bug where putting someone in a sleeper didn't set it as occupied, allowing others to climb in which would destroy the mob already inside.
- Fixed bug where players who hadn't entered the game could hear dsay - Runtime! now runs times. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2203 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -50,20 +50,20 @@
|
||||
icon_living = "tempcat"
|
||||
icon_dead = "gibbed-h"
|
||||
speak = list("Meow!","Esp!","Purr!","HSSSSS")
|
||||
speak_emote = list("meows", "purrs:")
|
||||
speak_emote = list("purrs", "meows")
|
||||
emote_hear = list("meows","mews")
|
||||
emote_see = list("shakes it's head", "shivers")
|
||||
speak_chance = 1
|
||||
turns_per_move = 5
|
||||
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
|
||||
meat_amount = 3
|
||||
meat_amount = 1
|
||||
response_help = "pets the"
|
||||
response_disarm = "gently pushes aside the"
|
||||
response_harm = "kicks the"
|
||||
|
||||
/mob/living/simple_animal/cat/Runtime
|
||||
name = "Runtime"
|
||||
desc = "It's Runtime, what else do you need to know?"
|
||||
desc = ""
|
||||
response_help = "pets"
|
||||
response_disarm = "gently pushes aside"
|
||||
response_harm = "kicks"
|
||||
|
||||
@@ -200,6 +200,7 @@
|
||||
usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head."
|
||||
return
|
||||
for (var/mob/V in viewers(user))
|
||||
occupied = 1
|
||||
V.show_message("[user] starts putting [G.affecting.name] into the sleeper.", 3)
|
||||
if(do_after(user, 20))
|
||||
if(!G || !G.affecting) return
|
||||
@@ -218,6 +219,8 @@
|
||||
src.add_fingerprint(user)
|
||||
del(G)
|
||||
return
|
||||
else
|
||||
occupied = 0
|
||||
return
|
||||
|
||||
/obj/machinery/sleeper/dummy/attackby()
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "HorPhareon", "LastFish", "unMportant", "Deurpyn" ) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
|
||||
|
||||
for (var/mob/M in world)
|
||||
if(M.stat == 2 || (M.client && M.client.holder))
|
||||
if(!istype(/mob/new_player, M))
|
||||
M.show_message(rendered, 2)
|
||||
if (istype(M, /mob/new_player))
|
||||
continue
|
||||
if (M.stat == 2 || (M.client && M.client.holder && M.client.deadchat)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
|
||||
M.show_message(rendered, 2)
|
||||
@@ -54,7 +54,30 @@ 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
|
||||
should be listed in the changelog upon commit tho. Thanks. -->
|
||||
|
||||
|
||||
<b><font color='blue'>14 September 2011:</font><b>
|
||||
<ul>
|
||||
<li><b>Lasty updated:</b>
|
||||
<ul>
|
||||
<li>Runtime now actually spawns in medbay because nobody cared whether it is a tiny smugfaced espeon that explodes violently on death or a spacecat that presumably doesn't.</li>
|
||||
<li>You can no longer put someone into a sleeper and erase them from existence by climbing into the same sleeper.</li>
|
||||
<li>Players who haven't entered the game will no longer be able to hear administrators in deadchat.</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><b>Pete updated:</b>
|
||||
<ul>
|
||||
<li>Added new sprites for the light tube and glasses boxes.</li>
|
||||
<li>Fixed the bug where syndicate bundles would have an emergency O2 tank and breath mask.</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><b>Mport, SECOND REMOVER OF SUNS updated:</b>
|
||||
<ul>
|
||||
<li>Singularity absorbtion explosion range lowered and is now dependent on singularity size.</li>
|
||||
<li>Bag of Holding no longer instakills singularity, and the chance for bombs to destroy a singularity has been lowered from 25% to 10%.</li>
|
||||
<li>Removed THE SUN.</li>
|
||||
<li>Damage and stun duration from shocked doors has been lowered to account for a larger amount of energy in the powernet.</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<b><font color='blue'>13 September 2011:</font><b>
|
||||
<ul>
|
||||
<li><b>Errorage updated:</b>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Reference in New Issue
Block a user