mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
New virus called Retrovirus. It scrambles your UI and SE after a certain stage.
Implemented CTRL+DIRECTION KEY to face a direction. Tweaked some drink icons. Added in two new icon_states to genetics.dmi. It doesn't do anything yet, but I might toy with them later on. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1954 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1913,6 +1913,17 @@
|
||||
var/list/data = list("viruses"= list(F))
|
||||
reagents.add_reagent("blood", 20, data)
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/bottle/retrovirus
|
||||
name = "Retrovirus culture bottle"
|
||||
desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/dna_retrovirus(0)
|
||||
var/list/data = list("viruses"= list(F))
|
||||
reagents.add_reagent("blood", 20, data)
|
||||
|
||||
/*
|
||||
/obj/item/weapon/reagent_containers/glass/bottle/gbs
|
||||
name = "GBS culture bottle"
|
||||
|
||||
@@ -36,7 +36,7 @@ to null does not delete the object itself. Thank you.
|
||||
var/carrier = 0.0 //there will be a small chance that the person will be a carrier
|
||||
var/curable = 0 //can this disease be cured? (By itself...)
|
||||
var/list/strain_data = list() //This is passed on to infectees
|
||||
var/stage_prob = 4 // probability of advancing to next stage, default 5% per check
|
||||
var/stage_prob = 4 // probability of advancing to next stage, default 4% per check
|
||||
var/agent = "some microbes"//name of the disease agent
|
||||
var/permeability_mod = 1//permeability modifier coefficient.
|
||||
var/desc = null//description. Leave it null and this disease won't show in med records.
|
||||
|
||||
@@ -160,6 +160,19 @@
|
||||
M.dna.struc_enzymes = newdna
|
||||
return
|
||||
|
||||
/proc/scramble(var/type, mob/M as mob, var/p)
|
||||
if(type)
|
||||
for(var/i = 1, i <= 13, i++)
|
||||
if(prob(p))
|
||||
M.dna.uni_identity = setblock(M.dna.uni_identity, i, add_zero2(num2hex(rand(1,4095), 1), 3), 3)
|
||||
updateappearance(M, M.dna.uni_identity)
|
||||
|
||||
else
|
||||
for(var/i = 1, i <= 13, i++)
|
||||
if(prob(p))
|
||||
M.dna.struc_enzymes = setblock(M.dna.struc_enzymes, i, add_zero2(num2hex(rand(1,4095), 1), 3), 3)
|
||||
domutcheck(M, null)
|
||||
|
||||
/proc/randmuti(mob/M as mob)
|
||||
var/num
|
||||
var/newdna
|
||||
|
||||
@@ -2257,3 +2257,86 @@ note dizziness decrements automatically in the mob's Life() proc.
|
||||
else
|
||||
boom.icon_state = "loss_general"
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// facing verbs
|
||||
/mob/verb/eastface()
|
||||
set hidden = 1
|
||||
if(!canmove)
|
||||
return
|
||||
if (client.moving)
|
||||
return 0
|
||||
if (world.time < client.move_delay)
|
||||
return
|
||||
if (stat==2)
|
||||
return
|
||||
if (anchored)
|
||||
return
|
||||
if (monkeyizing)
|
||||
return
|
||||
if (restrained())
|
||||
return
|
||||
dir = EAST
|
||||
client.move_delay += movement_delay()
|
||||
|
||||
/mob/verb/westface()
|
||||
set hidden = 1
|
||||
if(!canmove)
|
||||
return
|
||||
if (client.moving)
|
||||
return 0
|
||||
if (world.time < client.move_delay)
|
||||
return
|
||||
if (stat==2)
|
||||
return
|
||||
if (anchored)
|
||||
return
|
||||
if (monkeyizing)
|
||||
return
|
||||
if (restrained())
|
||||
return
|
||||
dir = WEST
|
||||
client.move_delay += movement_delay()
|
||||
|
||||
/mob/verb/northface()
|
||||
set hidden = 1
|
||||
if(!canmove)
|
||||
return
|
||||
if (client.moving)
|
||||
return 0
|
||||
if (world.time < client.move_delay)
|
||||
return
|
||||
if (stat==2)
|
||||
return
|
||||
if (anchored)
|
||||
return
|
||||
if (monkeyizing)
|
||||
return
|
||||
if (restrained())
|
||||
return
|
||||
dir = NORTH
|
||||
client.move_delay += movement_delay()
|
||||
|
||||
/mob/verb/southface()
|
||||
set hidden = 1
|
||||
if(!canmove)
|
||||
return
|
||||
if (client.moving)
|
||||
return 0
|
||||
if (world.time < client.move_delay)
|
||||
return
|
||||
if (stat==2)
|
||||
return
|
||||
if (anchored)
|
||||
return
|
||||
if (monkeyizing)
|
||||
return
|
||||
if (restrained())
|
||||
return
|
||||
dir = SOUTH
|
||||
client.move_delay += movement_delay()
|
||||
|
||||
|
||||
+13
-4
@@ -45,16 +45,25 @@ Stuff which is in development and not yet visible to players or just code relate
|
||||
(is. 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'>30 July 2011.</font color><b>
|
||||
<ul>
|
||||
<li><b>Doohl updated</b>:
|
||||
<ul>
|
||||
<li>New virus: Retrovirus. It basically screws over your DNA.</li>
|
||||
<li>You can now do CTRL+MOVEMENT to face any direction you want. See those chairs in Medbay and the Escape Wing? You can do CTRL+EAST to actually RP that you're sitting on them. Is this cool or what?!
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<b><font color='blue'>29 July 2011. - Day of Forum revival!</font color><b>
|
||||
<ul>
|
||||
<li><b>Doohl updated</b>
|
||||
<li><b>Doohl updated</b>:
|
||||
<ul>
|
||||
<li>Bugfix: Metroids should never "shut down" and just die in a corner when they begin starving. And so, hungry Metroids are a force to be feared.</li>
|
||||
<li>The Cargo computers now have the ability to cancel pending orders to refund credits. This was put in place so that idiots couldn't waste all the cargo points and run off. However, if the shuttle is en route to the station you won't be able to cancel orders.</li>
|
||||
<li><font color='blue'>Bugfix: the manifest has been fixed!</font color> Additionally, the manfiest is now updated realtime; job changes and new arrivals will be automatically updated into the manifest. Joy!</li>
|
||||
<li>Metroids, when wrestled off of someone's head or beaten off, now get stunned for a few seconds.</li>
|
||||
</ul>
|
||||
<li><b>Agouri updated</b>
|
||||
<li><b>Agouri updated</b>:
|
||||
<ul>
|
||||
<li>I was always bothered by how unprofessional it was of Nanotransen (in before >Nanotransen >professionalism) to just lay expensive spacesuits in racks and just let them be. Well, no more. Introducing...</li>
|
||||
<li>Suit Storage Units. Rumored to actually be repurposed space radiators, these wondrous machines will store any kind of spacesuit in a clean and sterile environment.</li>
|
||||
@@ -67,12 +76,12 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
<li>Sprite credit goes to Alex Jones, his portfolio can be found here: <a href="http://bspbox.com/">http://bspbox.com</a>. Thanks a lot, bro.</li>
|
||||
<li>With the recent forum fuss and all that, I've got a thread to specifically contain rants and bug reports about this update. <a href="http://tgstation13.servehttp.com/phpBB3/viewtopic.php?f=3&t=5569&p=45549&sid=a4a96f5b0e896cd3e3f7c1db73f09f1b#p45549">Click me</a></li>
|
||||
</ul>
|
||||
<li><b>Uhangi updated</b>
|
||||
<li><b>Uhangi updated</b>:
|
||||
<ul>
|
||||
<li>EVA redesigned</li>
|
||||
<li>An electropack is now available once again on the prison station</li>
|
||||
</ul>
|
||||
<li><b>Errorage updated</b>
|
||||
<li><b>Errorage updated</b>:
|
||||
<ul>
|
||||
<li>Hopefully fixed the derelict 'hotspots'. Derelict medbay has also been fixed.</li>
|
||||
</ul>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
@@ -19,18 +19,34 @@ macro "macro"
|
||||
name = "NORTHWEST+REP"
|
||||
command = ".northwest"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "CTRL+WEST"
|
||||
command = "westface"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "WEST+REP"
|
||||
command = ".west"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "CTRL+NORTH"
|
||||
command = "northface"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "NORTH+REP"
|
||||
command = ".north"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "CTRL+EAST"
|
||||
command = "eastface"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "EAST+REP"
|
||||
command = ".east"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "CTRL+SOUTH"
|
||||
command = "southface"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "SOUTH+REP"
|
||||
command = ".south"
|
||||
@@ -193,6 +209,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = "Space Station 13"
|
||||
titlebar = true
|
||||
statusbar = true
|
||||
@@ -231,6 +248,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "splitter"
|
||||
on-size = ""
|
||||
left = ""
|
||||
right = "rpane"
|
||||
is-vert = true
|
||||
@@ -256,6 +274,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "command"
|
||||
on-size = ""
|
||||
command = ""
|
||||
multi-line = false
|
||||
is-password = false
|
||||
@@ -279,6 +298,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Chat"
|
||||
image = ""
|
||||
command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\""
|
||||
@@ -306,6 +326,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Alt"
|
||||
image = ""
|
||||
command = ".winset \"macrobutton.is-checked=true?input.command=\"!.alt \" saybutton.is-checked=false:input.command=\""
|
||||
@@ -333,6 +354,7 @@ window "mainwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Host..."
|
||||
image = ""
|
||||
command = ".host"
|
||||
@@ -362,6 +384,7 @@ window "mapwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = ""
|
||||
titlebar = false
|
||||
statusbar = false
|
||||
@@ -400,6 +423,7 @@ window "mapwindow"
|
||||
drop-zone = true
|
||||
right-click = false
|
||||
saved-params = "icon-size"
|
||||
on-size = ""
|
||||
icon-size = 0
|
||||
text-mode = false
|
||||
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
|
||||
@@ -425,6 +449,7 @@ window "outputwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = ""
|
||||
titlebar = false
|
||||
statusbar = false
|
||||
@@ -463,6 +488,7 @@ window "outputwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "max-lines"
|
||||
on-size = ""
|
||||
link-color = #0000ff
|
||||
visited-color = #ff00ff
|
||||
style = ".system {color:#ff0000;}"
|
||||
@@ -490,6 +516,7 @@ window "rpane"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = ""
|
||||
titlebar = true
|
||||
statusbar = true
|
||||
@@ -528,6 +555,7 @@ window "rpane"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "splitter"
|
||||
on-size = ""
|
||||
left = ""
|
||||
right = "outputwindow"
|
||||
is-vert = false
|
||||
@@ -553,6 +581,7 @@ window "rpane"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Text"
|
||||
image = ""
|
||||
command = ".winset \"rpanewindow.left=;\""
|
||||
@@ -580,6 +609,7 @@ window "rpane"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Browser"
|
||||
image = ""
|
||||
command = ".winset \"rpanewindow.left=browserwindow\""
|
||||
@@ -607,6 +637,7 @@ window "rpane"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "is-checked"
|
||||
on-size = ""
|
||||
text = "Info"
|
||||
image = ""
|
||||
command = ".winset \"rpanewindow.left=infowindow\""
|
||||
@@ -636,6 +667,7 @@ window "browserwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = "Browser"
|
||||
titlebar = true
|
||||
statusbar = true
|
||||
@@ -674,6 +706,7 @@ window "browserwindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = ""
|
||||
on-size = ""
|
||||
show-history = true
|
||||
show-url = false
|
||||
auto-format = true
|
||||
@@ -701,6 +734,7 @@ window "infowindow"
|
||||
drop-zone = false
|
||||
right-click = false
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = "Info"
|
||||
titlebar = true
|
||||
statusbar = true
|
||||
@@ -739,6 +773,7 @@ window "infowindow"
|
||||
drop-zone = true
|
||||
right-click = false
|
||||
saved-params = ""
|
||||
on-size = ""
|
||||
highlight-color = #00aa00
|
||||
tab-text-color = #000000
|
||||
tab-background-color = none
|
||||
|
||||
+3
-2
@@ -133,6 +133,7 @@
|
||||
#define FILE_DIR "icons/turf"
|
||||
#define FILE_DIR "interface"
|
||||
#define FILE_DIR "maps"
|
||||
#define FILE_DIR "maps/backup"
|
||||
#define FILE_DIR "sound"
|
||||
#define FILE_DIR "sound/ambience"
|
||||
#define FILE_DIR "sound/announcer"
|
||||
@@ -205,6 +206,7 @@
|
||||
#include "code\datums\diseases\magnitis.dm"
|
||||
#include "code\datums\diseases\pierrot_throat.dm"
|
||||
#include "code\datums\diseases\plasmatoid.dm"
|
||||
#include "code\datums\diseases\retrovirus.dm"
|
||||
#include "code\datums\diseases\rhumba_beat.dm"
|
||||
#include "code\datums\diseases\robotic_transformation.dm"
|
||||
#include "code\datums\diseases\wizarditis.dm"
|
||||
@@ -396,7 +398,6 @@
|
||||
#include "code\game\machinery\Sleeper.dm"
|
||||
#include "code\game\machinery\spaceheater.dm"
|
||||
#include "code\game\machinery\status_display.dm"
|
||||
#include "code\game\machinery\suit_storage_unit.dm"
|
||||
#include "code\game\machinery\teleporter.dm"
|
||||
#include "code\game\machinery\turrets.dm"
|
||||
#include "code\game\machinery\vending.dm"
|
||||
@@ -861,6 +862,6 @@
|
||||
#include "code\WorkInProgress\recycling\scrap.dm"
|
||||
#include "code\WorkInProgress\recycling\sortingmachinery.dm"
|
||||
#include "interface\skin.dmf"
|
||||
#include "maps\tgstation.2.0.8.dmm"
|
||||
#include "maps\TestingMap.dmm"
|
||||
// END_INCLUDE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user