mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
-Added Armor run to admin tomes
-Resolved Issue 720. Message should now properly tell you who got cult armor -Resolved Issue 642. Bad indentation caused girders to disappear if you move away while building them. -Commented out admin messages when monkeys used non-monkey SEs -Atmos techs given Construction Area access -Remapped the south end of Med-Sci --Misc. Research Lab added to science --Virology moved to be made more isolated -Updated Changelog git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4312 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1128,6 +1128,10 @@ proc/process_ghost_teleport_locs()
|
||||
name = "\improper Toxins Mixing Room"
|
||||
icon_state = "toxmix"
|
||||
|
||||
/area/toxins/misc_lab
|
||||
name = "Miscellaneous Research"
|
||||
icon_state = "toxtest"
|
||||
|
||||
/area/toxins/server
|
||||
name = "\improper Server Room"
|
||||
icon_state = "server"
|
||||
|
||||
@@ -214,7 +214,7 @@
|
||||
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
|
||||
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth)
|
||||
if("Atmospheric Technician")
|
||||
return list(access_atmospherics, access_maint_tunnels, access_emergency_storage)
|
||||
return list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction)
|
||||
if("Bartender")
|
||||
return list(access_bar)
|
||||
if("Chemist")
|
||||
|
||||
@@ -622,7 +622,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
|
||||
var/r
|
||||
if (!istype(user.loc,/turf))
|
||||
user << "\red You do not have enough space to write a proper rune."
|
||||
var/list/runes = list("teleport", "itemport", "tome", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun")
|
||||
var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun")
|
||||
r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable.
|
||||
var/obj/effect/rune/R = new /obj/effect/rune
|
||||
if(istype(user, /mob/living/carbon/human))
|
||||
|
||||
@@ -1000,7 +1000,7 @@ var/list/sacrificed = list()
|
||||
usr.say("N'ath reth sh'yro eth d[pick("'","`")]raggathnor!")
|
||||
else
|
||||
usr.whisper("N'ath reth sh'yro eth d[pick("'","`")]raggathnor!")
|
||||
usr.visible_message("\red Rune disappears with a flash of red light, and a set of armor appears on you..", \
|
||||
usr.visible_message("\red The rune disappears with a flash of red light, and a set of armor appears on [usr]...", \
|
||||
"\red You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.")
|
||||
|
||||
user.equip_if_possible(new /obj/item/clothing/head/culthood/alt(user), user.slot_head)
|
||||
|
||||
@@ -110,10 +110,10 @@
|
||||
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)")
|
||||
log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)")
|
||||
else
|
||||
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
||||
// message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
||||
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
||||
else
|
||||
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
||||
// message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
|
||||
log_game("[key_name(user)] injected [key_name(M)] with the [name]")
|
||||
inuse = 1
|
||||
inject(M, user)//Now we actually do the heavy lifting.
|
||||
|
||||
@@ -111,7 +111,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/plasteel)
|
||||
if(!anchored)
|
||||
@@ -134,7 +134,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
else
|
||||
if(S.amount < 1) return ..()
|
||||
user << "\blue Now reinforcing girders"
|
||||
@@ -144,7 +144,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
user << "\blue Girders reinforced!"
|
||||
new/obj/structure/girder/reinforced( src.loc )
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/gold)
|
||||
if(!anchored)
|
||||
@@ -166,7 +166,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/silver)
|
||||
if(!anchored)
|
||||
@@ -188,7 +188,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/diamond)
|
||||
if(!anchored)
|
||||
@@ -210,7 +210,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/uranium)
|
||||
if(!anchored)
|
||||
@@ -232,7 +232,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/plasma)
|
||||
if(!anchored)
|
||||
@@ -254,7 +254,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/clown)
|
||||
if(!anchored)
|
||||
@@ -275,7 +275,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
if(/obj/item/stack/sheet/sandstone)
|
||||
if(!anchored)
|
||||
@@ -297,7 +297,7 @@ obj/structure/meteorhit(obj/O as obj)
|
||||
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
|
||||
if(X) X.add_hiddenprint(usr)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
add_hiddenprint(usr)
|
||||
del(src)
|
||||
|
||||
@@ -47,6 +47,15 @@ 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 4, 2012</h2>
|
||||
<h3 class="author">Icarus updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Changes to Med-Sci south and surrounding maintenance areas. Virology is more isolated and Science gets a new Misc. Research Lab.</li>
|
||||
<li class="tweak">Atmos techs get construction access now to do their little projects in.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">August 2, 2012</h2>
|
||||
<h3 class="author">Errorage updated:</h3>
|
||||
|
||||
+8219
-8200
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user