cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from ZomgPonies/master

Browse Source 
Downstream merge
This commit is contained in:
Bone-White
2014-10-09 04:33:00 +01:00
parent 09a0eee875 a10b1538f7
commit cfd27a11ee
8 changed files with 157 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+1 -1
View File
@@ -79,7 +79,7 @@
var/wikiurl = "http://baystation12.net/wiki"
var/forumurl = "http://baystation12.net/forums/"
var/media_base_url = "http://80.244.78.90/media" // http://ss13.nexisonline.net/media
var/media_base_url = "http://nanotrasen.se/media" // http://ss13.nexisonline.net/media
//Alert level description
var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
code/game/machinery/hydroponics.dm
+75 -35
View File
@@ -374,6 +374,10 @@
return
seed.harvest(user,yield_mod)
//Increases harvest count for round-end score
//Currently per-plant (not per-item) harvested
// --FalseIncarnate
score_stuffharvested++
// Reset values.
harvest = 0
@@ -538,9 +542,79 @@
/obj/machinery/portable_atmospherics/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
//--FalseIncarnate
//Check if held item is an open container
if (O.is_open_container())
return 0
//Check if container is of the "glass" subtype (includes buckets, beakers, vials)
if(istype(O, /obj/item/weapon/reagent_containers/glass))
var/obj/item/weapon/reagent_containers/glass/C = O
//Check if container is empty
if(!C.reagents.total_volume)
user << "\red [C] is empty."
return
//Container not empty, transfer contents to tray
var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this)
user << "\blue You transfer [trans] units of the solution to [src]."
check_level_sanity()
process_reagents()
update_icon()
//Check if container is one of the botany sprays (defined in hydro_tools.dm)
else if(istype(O, /obj/item/weapon/plantspray))
//Check if spray is pest-spray
if(istype(O, /obj/item/weapon/plantspray/pests))
var/obj/item/weapon/plantspray/P = O
user.drop_item(O)
toxins += P.toxicity
pestlevel -= P.pest_kill_str
weedlevel -= P.weed_kill_str
user << "You spray [src] with [O]."
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
del(O)
check_level_sanity()
update_icon()
//Check if spray is weed-spray (un-obtainable, fixed for possible repurposing?)
else if(istype(O, /obj/item/weapon/plantspray/weeds))
var/obj/item/weapon/plantspray/W = O
user.drop_item(O)
toxins += W.toxicity
pestlevel -= W.pest_kill_str
weedlevel -= W.weed_kill_str
user << "You spray [src] with [O]."
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
del(O)
check_level_sanity()
update_icon()
//Check if container is Plant-B-Gone spray (doesn't work with other sprays, may add in future)
else if (istype(O, /obj/item/weapon/reagent_containers/spray/plantbgone))
//Check if there is a plant in the tray
if(seed)
health -= rand(5,20)
if(pestlevel > 0)
pestlevel -= 2
if(weedlevel > 0)
weedlevel -= 3
toxins += 4
check_level_sanity()
visible_message("\red <B>\The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
update_icon()
else
user << "There's nothing in [src] to spray!"
//--FalseIncarnate
//Held item is not an open container, check to see if it can be used (this code was already here) --FalseIncarnate
if(istype(O, /obj/item/weapon/wirecutters) || istype(O, /obj/item/weapon/scalpel))
if(!seed)
@@ -615,26 +689,6 @@
else
user << "\red \The [src] already has seeds in it!"
else if (istype(O, /obj/item/weapon/reagent_containers/spray/plantbgone))
if(seed)
health -= rand(5,20)
if(pestlevel > 0)
pestlevel -= 2
if(weedlevel > 0)
weedlevel -= 3
toxins += 4
check_level_sanity()
visible_message("\red <B>\The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
update_icon()
else
user << "There's nothing in [src] to spray!"
else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe
//var/deweeding
if(weedlevel > 0)
@@ -654,20 +708,6 @@
return
S.handle_item_insertion(G, 1)
else if ( istype(O, /obj/item/weapon/plantspray) )
var/obj/item/weapon/plantspray/spray = O
user.drop_item(O)
toxins += spray.toxicity
pestlevel -= spray.pest_kill_str
weedlevel -= spray.weed_kill_str
user << "You spray [src] with [O]."
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
del(O)
check_level_sanity()
update_icon()
else if(istype(O, /obj/item/weapon/wrench))
//If there's a connector here, the portable_atmospherics setup can handle it.
code/game/objects/items/weapons/manuals.dm
+1 -1
View File
@@ -676,7 +676,7 @@
</head>
<body>
<iframe width='100%' height='97%' src="http://80.244.78.90/wiki/index.php?title=Space_law&printable=yes" frameborder="0" id="main_frame"></iframe> </body>
<iframe width='100%' height='97%' src="http://nanotrasen.se/wiki/index.php?title=Space_law&printable=yes" frameborder="0" id="main_frame"></iframe> </body>
</html>
code/game/objects/structures/crates_lockers/crates.dm
+62
View File
@@ -68,6 +68,68 @@
return 1
/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
var/obj/item/weapon/rcs/E = W
if(E.rcharges != 0)
if(E.mode == 0)
if(!E.teleporting)
var/list/L = list()
var/list/areaindex = list()
for(var/obj/machinery/telepad_cargo/R in world)
if(R.stage == 0)
var/turf/T = get_turf(R)
var/tmpname = T.loc.name
if(areaindex[tmpname])
tmpname = "[tmpname] ([++areaindex[tmpname]])"
else
areaindex[tmpname] = 1
L[tmpname] = R
var/desc = input("Please select a telepad.", "RCS") in L
E.pad = L[desc]
playsound(E.loc, 'sound/machines/click.ogg', 50, 1)
user << "\blue Teleporting [src.name]..."
E.teleporting = 1
sleep(50)
E.teleporting = 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
do_teleport(src, E.pad, 0)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
return
else
E.rand_x = rand(50,200)
E.rand_y = rand(50,200)
var/L = locate(E.rand_x, E.rand_y, 6)
playsound(E.loc, 'sound/machines/click.ogg', 50, 1)
user << "\blue Teleporting [src.name]..."
E.teleporting = 1
sleep(50)
E.teleporting = 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
do_teleport(src, L)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
return
else
user << "\red Out of charges."
return
if(opened)
if(isrobot(user))
return
code/modules/mining/ore_datum.dm
+4
View File
@@ -49,3 +49,7 @@
smelts_to = /obj/item/stack/sheet/mineral/tritium
compresses_to = /obj/item/stack/sheet/mineral/mhydrogen
oretag = "hydrogen"
/datum/ore/clown
smelts_to = /obj/item/stack/sheet/mineral/clown
oretag = "clown"
code/modules/mob/living/carbon/human/emote.dm
+11 -5
View File
@@ -533,12 +533,18 @@
m_type = 1
else
if (!muzzled)
message = "<B>[src]</B> screams!"
m_type = 2
if (prob(5))
playsound(src.loc, 'sound/voice/WilhelmScream.ogg', 100, 1, 10)
if (!(species.name == "Vox" || species.name == "Vox Armalis"))
message = "<B>[src]</B> screams!"
m_type = 2
if (prob(5))
playsound(src.loc, 'sound/voice/WilhelmScream.ogg', 100, 1, 10)
else
playsound(src.loc, 'sound/voice/scream2.ogg', 100, 1, 10)
else
playsound(src.loc, 'sound/voice/scream2.ogg', 100, 1, 10)
message = "<B>[src]</B> shrieks!"
m_type = 2
playsound(src.loc, 'sound/voice/shriek1.ogg', 100, 1, 10)
else
message = "<B>[src]</B> makes a very loud noise."
m_type = 2
code/world.dm
+1 -1
View File
@@ -323,7 +323,7 @@ var/world_topic_spam_protect_time = world.timeofday
s += "<b>[station_name()]</b>";
s += " ("
s += "<a href=\"http://80.244.78.90/phpBB3/index.php\">" //Change this to wherever you want the hub to link to.
s += "<a href=\"http://nanotrasen.se/phpBB3/index.php\">" //Change this to wherever you want the hub to link to.
s += "[game_version]"
s += "</a>"
s += ")"
interface/interface.dm
+2 -2
View File
@@ -13,7 +13,7 @@
src << "<span class='danger'>The wiki URL is not set in the server configuration.</span>"
return
#define CHANGELOG "http://80.244.78.90/phpBB3/viewtopic.php?f=10&t=36"
#define CHANGELOG "http://nanotrasen.se/phpBB3/viewtopic.php?f=10&t=36"
/client/verb/changes()
set name = "Changelog"
set desc = "Visit the forum to check out the changelog."
@@ -45,7 +45,7 @@
src << browse(file(RULES_FILE), "window=rules;size=480x320")
#undef RULES_FILE
#define DONATE "http://80.244.78.90/phpBB3/donate.php"
#define DONATE "http://nanotrasen.se/phpBB3/donate.php"
/client/verb/donate()
set name = "Donate"
set desc = "Donate to help with development costs."