mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Added Ikarrus's latest map updates. Changes to genetics, medbay, research and security.
Updated operating tables to search for adjacent computers, rather than using an ID. Switched back to the old bodybag sprites. Slightly updated the Oddy destroyed sprites, and updated the changelog. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3547 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -12,13 +12,13 @@
|
||||
var/strapped = 0.0
|
||||
|
||||
var/obj/machinery/computer/operating/computer = null
|
||||
var/id = 0.0
|
||||
|
||||
/obj/machinery/optable/New()
|
||||
..()
|
||||
for(var/obj/machinery/computer/operating/O in world)
|
||||
if(src.id == O.id)
|
||||
src.computer = O
|
||||
for(dir in list(NORTH,EAST,SOUTH,WEST))
|
||||
computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
|
||||
if (!isnull(computer))
|
||||
break
|
||||
spawn(100)
|
||||
process()
|
||||
|
||||
|
||||
@@ -7,15 +7,13 @@
|
||||
var
|
||||
mob/living/carbon/human/victim = null
|
||||
obj/machinery/optable/table = null
|
||||
id = 0.0
|
||||
|
||||
|
||||
/obj/machinery/computer/operating/New()
|
||||
..()
|
||||
for(var/obj/machinery/optable/O in world)
|
||||
if(src.id == O.id)
|
||||
src.table = O
|
||||
|
||||
for(dir in list(NORTH,EAST,SOUTH,WEST))
|
||||
table = locate(/obj/machinery/optable, get_step(src, dir))
|
||||
if (!isnull(table))
|
||||
break
|
||||
|
||||
/obj/machinery/computer/operating/attack_ai(mob/user)
|
||||
add_fingerprint(user)
|
||||
@@ -55,7 +53,7 @@
|
||||
<B>Toxins Damage:</B> [src.victim.getToxLoss()]<BR>
|
||||
<B>Fire Damage:</B> [src.victim.getFireLoss()]<BR>
|
||||
<B>Suffocation Damage:</B> [src.victim.getOxyLoss()]<BR>
|
||||
<B>Patient Status:</B> [src.victim.stat ? "Non-responsive" : "Stable"]<BR>
|
||||
<B>Patient Status:</B> [src.victim.stat ? "Non-Responsive" : "Stable"]<BR>
|
||||
"}
|
||||
else
|
||||
src.victim = null
|
||||
|
||||
+14
-3
@@ -46,9 +46,20 @@ Stuff which is in development and not yet visible to players or just code relate
|
||||
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">Thursday, May 3rd</h2>
|
||||
<h3 class="author">Ikarrus updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Updated genetics, medbay and security.</li>
|
||||
</ul>
|
||||
<h3 class="author">Petethegoat updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd"><a href='#' id='minimoog' onclick="changeText('minimoogtext','Added BS12\'s piano code.','minimoog')"><span id='minimoogtext'>MINIMOOOOOOOOOOOOOOOOG</span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">5/1/2012</h2>
|
||||
<h2 class="date">Tuesday, May 1st</h2>
|
||||
<h3 class="author">PolymorphBlue updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds BS12 dismemberment!</li>
|
||||
@@ -58,7 +69,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
|
||||
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">Monday, April 20th 2012</h2>
|
||||
<h2 class="date">Monday, April 20th</h2>
|
||||
<h3 class="author">Erro updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added a verb to the PDA which you can use to remove an ID in it. If your active hand is empy, it puts it there otherwise it puts it on the floor under you.</li>
|
||||
@@ -66,7 +77,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
</div>
|
||||
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">April 27 2012</h2>
|
||||
<h2 class="date">Wednesday, April 27th</h2>
|
||||
<h3 class="author">Cheridan updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">-New sprites for lemons, oranges, and walking mushroom critters. -Added Invisty's new blob sprites.</li>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 119 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
+9379
-9320
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user