Renamed access_medlab to access_genetics.

Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3576 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-05-11 12:28:02 +00:00
parent e20e769614
commit bec8e2cf37
9 changed files with 9572 additions and 9415 deletions

View File

@@ -483,8 +483,8 @@ proc/process_ghost_teleport_locs()
//PRISON
/area/prison
name = "Brig Prison Wing"
icon_state = "brig"
name = "Prison Wing"
icon_state = "security"
/area/prison/arrival_airlock
name = "Prison Station Airlock"
@@ -905,6 +905,11 @@ proc/process_ghost_teleport_locs()
icon_state = "teleporter"
music = "signal"
/area/teleporter/gateway
name = "Secure Construction Area"
icon_state = "teleporter"
music = "signal"
/area/AIsattele
name = "AI Satellite Teleporter Room"
icon_state = "teleporter"

View File

@@ -50,25 +50,74 @@
north // moving to the north
pushdirection = SOUTH
pushdirection = SOUTH // south because the space tile is scrolling south
one
icon_state = "1_south" // south because the space tile is scrolling south
two
icon_state = "2_south"
three
icon_state = "3_south"
//IF ANYONE KNOWS A MORE EFFICIENT WAY OF MANAGING THESE SPRITES, BE MY GUEST.
shuttlespace_ns1
icon_state = "speedspace_ns_1"
shuttlespace_ns2
icon_state = "speedspace_ns_2"
shuttlespace_ns3
icon_state = "speedspace_ns_3"
shuttlespace_ns4
icon_state = "speedspace_ns_4"
shuttlespace_ns5
icon_state = "speedspace_ns_5"
shuttlespace_ns6
icon_state = "speedspace_ns_6"
shuttlespace_ns7
icon_state = "speedspace_ns_7"
shuttlespace_ns8
icon_state = "speedspace_ns_8"
shuttlespace_ns9
icon_state = "speedspace_ns_9"
shuttlespace_ns10
icon_state = "speedspace_ns_10"
shuttlespace_ns11
icon_state = "speedspace_ns_11"
shuttlespace_ns12
icon_state = "speedspace_ns_12"
shuttlespace_ns13
icon_state = "speedspace_ns_13"
shuttlespace_ns14
icon_state = "speedspace_ns_14"
shuttlespace_ns15
icon_state = "speedspace_ns_15"
east // moving to the east
pushdirection = WEST
one
icon_state = "1_west" // space tile is scrolling west
two
icon_state = "2_west"
three
icon_state = "3_west"
shuttlespace_ew1
icon_state = "speedspace_ew_1"
shuttlespace_ew2
icon_state = "speedspace_ew_2"
shuttlespace_ew3
icon_state = "speedspace_ew_3"
shuttlespace_ew4
icon_state = "speedspace_ew_4"
shuttlespace_ew5
icon_state = "speedspace_ew_5"
shuttlespace_ew6
icon_state = "speedspace_ew_6"
shuttlespace_ew7
icon_state = "speedspace_ew_7"
shuttlespace_ew8
icon_state = "speedspace_ew_8"
shuttlespace_ew9
icon_state = "speedspace_ew_9"
shuttlespace_ew10
icon_state = "speedspace_ew_10"
shuttlespace_ew11
icon_state = "speedspace_ew_11"
shuttlespace_ew12
icon_state = "speedspace_ew_12"
shuttlespace_ew13
icon_state = "speedspace_ew_13"
shuttlespace_ew14
icon_state = "speedspace_ew_14"
shuttlespace_ew15
icon_state = "speedspace_ew_15"
@@ -79,6 +128,8 @@
if(!istype(src, /turf/space/transit))
icon_state = "[pick(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25)]"
/turf/simulated
name = "station"
var/wet = 0

View File

@@ -7,7 +7,7 @@
access_morgue = 6
access_tox = 7
access_tox_storage = 8
access_medlab = 9
access_genetics = 9
access_engine = 10
access_engine_equip= 11
access_maint_tunnels = 12
@@ -174,7 +174,7 @@
/proc/get_access(job)
switch(job)
if("Geneticist")
return list(access_medical, access_morgue, access_medlab)
return list(access_medical, access_morgue, access_genetics)
if("Station Engineer")
return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
if("Assistant")
@@ -200,13 +200,13 @@
if("Scientist")
return list(access_tox, access_tox_storage, access_research, access_xenobiology)
if("Head of Security")
return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_medlab, access_court,
return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_genetics, access_court,
access_teleporter, access_heads, access_tech_storage, access_security, access_brig, access_atmospherics,
access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics,
access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth)
if("Head of Personnel")
return list(access_security, access_brig, access_court, access_forensics_lockers,
access_tox, access_tox_storage, access_chemistry, access_medical, access_medlab, access_engine,
access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine,
access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor,
access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_hydroponics, access_lawyer,
@@ -240,14 +240,14 @@
access_heads, access_ai_upload, access_construction, access_robotics,
access_mint, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat)
if("Research Director")
return list(access_rd, access_heads, access_tox,
return list(access_rd, access_heads, access_tox, access_genetics,
access_tox_storage, access_teleporter,
access_research, access_robotics, access_xenobiology,
access_RC_announce, access_keycard_auth, access_tcomsat)
if("Virologist")
return list(access_medical, access_morgue, access_virology)
if("Chief Medical Officer")
return list(access_medical, access_morgue, access_medlab, access_heads,
return list(access_medical, access_morgue, access_genetics, access_heads,
access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
access_keycard_auth)
else
@@ -276,7 +276,7 @@
/proc/get_all_accesses()
return list(access_security, access_brig, access_armory, access_forensics_lockers, access_court,
access_medical, access_medlab, access_morgue, access_rd,
access_medical, access_genetics, access_morgue, access_rd,
access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels,
access_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload,
access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers,
@@ -300,7 +300,7 @@
if(1) //security
return list(access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos)
if(2) //medbay
return list(access_medical, access_medlab, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo)
return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo)
if(3) //research
return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd)
if(4) //engineering and maintenance
@@ -348,7 +348,7 @@
return "Detective's Office"
if(access_medical)
return "Medical"
if(access_medlab)
if(access_genetics)
return "Genetics Lab"
if(access_morgue)
return "Morgue"

View File

@@ -18,7 +18,7 @@
var/locked = 1
//var/emagged = 0
var/obj/machinery/camera/cam = null
var/list/botcard_access = list(access_medical, access_morgue, access_medlab, access_robotics)
var/list/botcard_access = list(access_medical, access_morgue, access_genetics, access_robotics)
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
var/frustration = 0

View File

@@ -10,7 +10,7 @@
density = 1
icon = 'cloning.dmi'
icon_state = "pod_0"
req_access = list(access_medlab) //For premature unlocking.
req_access = list(access_genetics) //For premature unlocking.
var/mob/living/occupant
var/heal_level = 90 //The clone is released once its health reaches this level.
var/locked = 0

View File

@@ -14,7 +14,7 @@ for reference:
access_morgue = 6
access_tox = 7
access_tox_storage = 8
access_medlab = 9
access_genetics = 9
access_engine = 10
access_engine_equip= 11
access_maint_tunnels = 12

View File

@@ -47,7 +47,27 @@ 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">May 9th, 2012</h2>
<h2 class="date">Friday, May 11th</h2>
<h3 class="author">Icarus updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">New design for security. This should be the last time it sees major changes for a while.</li>
<li class="wip">Added a new construction area. What could it be for?</li>
</ul>
<h3 class="author">Petethegoat updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Readded the RD's genetics access.</li>
<li class="experiment">RD is still without chemistry access, but I'm going to review this decision in a week and see if R&D is useless due to lack of acid.</li>
<li class="imageadd">Added Flashkirby99's SMES sprites!</li>
</ul>
<h3 class="author">Invisty updated:</h3>
<ul class="changes bgimages16">
<li class="imageadd">Sexy new warpspace (or whatever) tiles.</li>
</ul>
<h3 class="author">Important changes below!</h3>
</div>
<div class="commit sansserif">
<h2 class="date">Thursday, May 10th</h2>
<h3 class="author">Sieve updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">Reverted dismemberment, the recent gun changes, and Tarajans. Before you shit up the forums, read this:</li>
@@ -58,11 +78,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
</div>
<div class="commit sansserif">
<h2 class="date">May 06-07, 2012</h2>
<h2 class="date">Sunday, May 6th</h2>
<h3 class="author">Cheridan updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">-New booze sprites for the drinks that were removed! Re-enabled the recipes for the removed drinks. Get cracking, bartenders. -You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM.</li>
<li class="tweak">-Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them!
<li class="imageadd">-New booze sprites for the drinks that were removed! Re-enabled the recipes for the removed drinks. Get cracking, bartenders. -You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM.</li>
<li class="rscadd">-Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them!
</ul>
</div>
@@ -123,7 +143,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<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>
<li class="imageadd">-New sprites for lemons, oranges, and walking mushroom critters. -Added Invisty's new blob sprites.</li>
<li class="rscadd">-Added a new chemical: lipozine, a weight loss drug. Made with sodium chloride, ethanol, and radium.</li>
</ul>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB

File diff suppressed because it is too large Load Diff