cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-10-24 09:12:02 +10:30
parent 6e26f72447 5633ed8c5a
commit 8d9d83d5ef
17 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_onclick/observer.dm
View File

@@ -25,6 +25,7 @@
// Otherwise jump
else
following = null
loc = get_turf(A)
/mob/dead/observer/ClickOn(var/atom/A, var/params)

2
code/game/gamemodes/cult/runes.dm
View File

@@ -105,7 +105,7 @@ var/list/sacrificed = list()
continue
usr.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!")
M.visible_message("\red [M] writhes in pain as the markings below \him glow a bloody red.", \
"\red AAAAAAHHHH!.", \
"\red AAAAAAHHHH!", \
"\red You hear an anguished scream.")
if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument

2
code/game/gamemodes/malfunction/malfunction.dm
View File

@@ -153,7 +153,7 @@
set name = "System Override"
set desc = "Start the victory timer"
if (!istype(ticker.mode,/datum/game_mode/malfunction))
usr << "You cannot begin a takeover in this round type!."
usr << "You cannot begin a takeover in this round type!"
return
if (ticker.mode:malf_mode_declared)
usr << "You've already begun your takeover."

2
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -472,7 +472,7 @@ var/global/list/holodeck_programs = list(
/obj/structure/holohoop
name = "basketball hoop"
desc = "Boom, Shakalaka!."
desc = "Boom, Shakalaka!"
icon = 'icons/obj/basketball.dmi'
icon_state = "hoop"
anchored = 1

3
code/game/objects/effects/effect_system.dm
View File

@@ -11,14 +11,13 @@ would spawn and follow the beaker, even if it is carried or thrown.
icon = 'icons/effects/effects.dmi'
mouse_opacity = 0
unacidable = 1//So effect are not targeted by alien acid.
flags = TABLEPASS
pass_flags = PASSTABLE | PASSGRILLE
/obj/effect/effect/water
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
var/life = 15.0
flags = TABLEPASS
mouse_opacity = 0
/obj/effect/proc/delete()

4
code/game/objects/items.dm
View File

@@ -684,7 +684,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
usr.client.pixel_x = -viewoffset
usr.client.pixel_y = 0
usr.visible_message("[usr] peers through the [devicename].")
usr.visible_message("[usr] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].")
/*
if(istype(usr,/mob/living/carbon/human/))
@@ -704,6 +704,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
usr.client.pixel_y = 0
if(!cannotzoom)
usr.visible_message("[usr] lowers the [devicename].")
usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].")
return

6
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -260,9 +260,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>"
for(var/index in tnote)
if(index["sent"])
HTML += addtext("<i><b>&rarr; To <a href='byond://?src=\ref[src];choice=Message;target=",index["src"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
HTML += addtext("<i><b>&rarr; To <a href='byond://?src=\ref[src];choice=Message;notap;target=",index["src"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
else
HTML += addtext("<i><b>&larr; From <a href='byond://?src=\ref[src];choice=Message;target=",index["target"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
HTML += addtext("<i><b>&larr; From <a href='byond://?src=\ref[src];choice=Message;notap;target=",index["target"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
HTML +="</body></html>"
usr << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
@@ -656,7 +656,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if("Message")
var/obj/item/device/pda/P = locate(href_list["target"])
src.create_message(U, P)
src.create_message(U, P, !("notap" in href_list))
if(mode == 2)
if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp.
active_conversation = href_list["target"]

2
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -78,7 +78,7 @@
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
user.visible_message("\red [user] breaks [src] over [M]'s back!.")
user.visible_message("\red [user] breaks [src] over [M]'s back!")
user.u_equip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
m.loc = get_turf(src)

28
code/modules/hydroponics/hydro_tray.dm
View File

@@ -21,6 +21,7 @@
var/dead = 0 // Is it dead?
var/harvest = 0 // Is it ready to harvest?
var/age = 0 // Current plant age
var/sampled = 0 // Have wa taken a sample?
// Harvest/mutation mods.
var/yield_mod = 0 // Modifier to yield
@@ -117,8 +118,8 @@
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/global/list/mutagenic_reagents = list(
"radium" = 3,
"mutagen" = 8
"radium" = 8,
"mutagen" = 15
)
/obj/machinery/portable_atmospherics/hydroponics/New()
@@ -172,7 +173,7 @@
// Weeds like water and nutrients, there's a chance the weed population will increase.
// Bonus chance if the tray is unoccupied.
if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 5 : 2))
if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 5 : 1))
weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
// There's a chance for a weed explosion to happen if the weeds take over.
@@ -345,7 +346,7 @@
if(weedkiller_reagents[R.id])
weedlevel -= weedkiller_reagents[R.id] * reagent_total
if(pestkiller_reagents[R.id])
pestlevel -= pestkiller_reagents[R.id] * reagent_total
pestlevel += pestkiller_reagents[R.id] * reagent_total
// Beneficial reagents have a few impacts along with health buffs.
if(beneficial_reagents[R.id])
@@ -398,6 +399,8 @@
seed = null
dead = 0
age = 0
sampled = 0
mutation_mod = 0
check_level_sanity()
update_icon()
@@ -413,6 +416,11 @@
seed = null
dead = 0
sampled = 0
age = 0
yield_mod = 0
mutation_mod = 0
user << "You remove the dead plant from the [src]."
check_level_sanity()
update_icon()
@@ -489,6 +497,7 @@
harvest = 0
weedlevel = 0
pestlevel = 0
sampled = 0
update_icon()
visible_message("\blue [src] has been overtaken by [seed.display_name].")
@@ -562,14 +571,21 @@
user << "There is nothing to take a sample from in \the [src]."
return
if(sampled)
user << "You have already sampled from this plant."
return
if(dead)
user << "\The plant is dead."
user << "The plant is dead."
return
// Create a sample.
seed.harvest(user,yield_mod,1)
health -= (rand(3,5)*10)
if(prob(30))
sampled = 1
// Bookkeeping.
check_level_sanity()
force_update = 1
@@ -789,4 +805,4 @@
..()
verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid
#undef HYDRO_SPEED_MULTIPLIER
#undef HYDRO_SPEED_MULTIPLIER

4
code/modules/hydroponics/seed_machines.dm
View File

@@ -44,7 +44,7 @@
var/open = 0
var/active = 0
var/action_time = 100
var/action_time = 50
var/last_action = 0
var/eject_disk = 0
var/failed_task = 0
@@ -335,4 +335,4 @@
seed.modified += rand(5,10)
usr.set_machine(src)
src.add_fingerprint(usr)
src.add_fingerprint(usr)

2
code/modules/power/solar.dm
View File

@@ -534,4 +534,4 @@ var/list/solars_list = list()
/obj/item/weapon/paper/solar
name = "paper- 'Going green! Setup your own solar array instructions.'"
info = "<h1>Welcome</h1><p>At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.</p><p>You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!.</p><p>Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.</p><p>Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.</p><p>That's all to it, be safe, be green!</p>"
info = "<h1>Welcome</h1><p>At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.</p><p>You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!</p><p>Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.</p><p>Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.</p><p>That's all to it, be safe, be green!</p>"

2
code/modules/projectiles/guns/energy/special.dm
View File

@@ -225,7 +225,7 @@ obj/item/weapon/gun/energy/staff/focus
charge_cost = 250
fire_delay = 35
w_class = 4.0
zoomdevicename = "sniper scope"
zoomdevicename = "scope"
/obj/item/weapon/gun/energy/sniperrifle/verb/scope()
set category = "Object"

2
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -3363,7 +3363,7 @@ datum
ethanol/brave_bull
name = "Brave Bull"
id = "bravebull"
description = "It's just as effective as Dutch-Courage!."
description = "It's just as effective as Dutch-Courage!"
color = "#664300" // rgb: 102, 67, 0
boozepwr = 3

2
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -1279,7 +1279,7 @@ datum
for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
slime.rabid = 1
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("\red The [slime] is driven into a frenzy!."), 1)
O.show_message(text("\red The [slime] is driven into a frenzy!"), 1)
//Pink
slimeppotion

2
code/modules/recycling/disposal.dm
View File

@@ -474,7 +474,7 @@
M.show_message("\the [I] lands in \the [src].", 3)
else
for(var/mob/M in viewers(src))
M.show_message("\the [I] bounces off of \the [src]'s rim!.", 3)
M.show_message("\the [I] bounces off of \the [src]'s rim!", 3)
return 0
else
return ..(mover, target, height, air_group)

2
code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
View File

@@ -66,7 +66,7 @@
positive_locations.Add(D)
for(var/mob/L in range(src, 1))
L << "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!."
L << "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!"
/obj/item/device/depth_scanner/attack_self(var/mob/user as mob)
return src.interact(user)

12
html/changelog.html
View File

@@ -56,6 +56,18 @@ should be listed in the changelog upon commit though. Thanks. -->
<!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
<div class='commit sansserif'>
<h2 class='date'>1 October 2014</h2>
<h3 class='author'>RavingManiac updated:</h3>
<ul class='changes bgimages16'>
<li class='rscadd'>Zooming with the sniper rifle now adds a view offset in the direction you are facing.</li>
<li class='rscadd'>Added binoculars - functionally similar to sniper scope. Adminspawn-only for now.</li>
<li class='rscadd'>Bottles from chemistry now, like beakers, use chemical overlays instead of fixed sprites.</li>
<li class='rscadd'>Being in space while not magbooted to something will cause your sprite to bob up and down.</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>1 October 2014</h2>
<h3 class='author'>Zuhayr updated:</h3>