diff --git a/LICENSE.txt b/COPYING
similarity index 91%
rename from LICENSE.txt
rename to COPYING
index 419cc18b370..5005fcd90f0 100644
--- a/LICENSE.txt
+++ b/COPYING
@@ -1,5 +1,5 @@
Baystation12
-Copyright (C) 2010-2012 Baystation12 and tgstation13.
+Copyright (C) 2010-2013 Baystation12 and tgstation13.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -12,4 +12,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
\ No newline at end of file
+along with this program. If not, see .
diff --git a/README.txt b/README.md
similarity index 73%
rename from README.txt
rename to README.md
index 30c2d952667..d016900cc37 100644
--- a/README.txt
+++ b/README.md
@@ -1,12 +1,10 @@
-baystation12
+# baystation12
-Website: http://baystation12.net/
-Code: http://github.com/Baystation12/Baystation12/
-IRC: irc://irc.sorcery.net/bs12
+[Website](http://baystation12.net/) - [Code](http://github.com/Baystation12/Baystation12/) - [IRC](http://baystation12.net/forums/viewtopic.php?f=12&t=5088)
-================================================================================
-INSTALLATION
-================================================================================
+---
+
+### INSTALLATION
First-time installation should be fairly straightforward. First, you'll need
BYOND installed. You can get it from http://www.byond.com/. Once you've done
@@ -16,9 +14,9 @@ Open baystation12.dme by double-clicking it, open the Build menu, and click
compile. This'll take a little while, and if everything's done right you'll get
a message like this:
-saving baystation12.dmb (DEBUG mode)
-
-baystation12.dmb - 0 errors, 0 warnings
+ saving baystation12.dmb (DEBUG mode)
+
+ baystation12.dmb - 0 errors, 0 warnings
If you see any errors or warnings, something has gone wrong - possibly a corrupt
download or the files extracted wrong.
@@ -38,7 +36,7 @@ You'll also want to edit admins.txt to remove the default admins and add your
own. "Game Master" is the highest level of access, and the other recommended
admin level for now is "Game Admin". The format is:
-byondkey - Rank
+ byondkey - Rank
where the BYOND key must be in lowercase and the admin rank must be properly
capitalised. There are a bunch more admin ranks, but these two should be
@@ -46,7 +44,7 @@ enough for most servers, assuming you have trustworthy admins.
Additionally, you can set up moderators in moderators.txt, with this format:
-byondkey
+ byondkey
Moderators have access to player notes and a few other low-level commands.
@@ -55,9 +53,9 @@ compiled baystation12.dmb file. Make sure to set the port to the one you
specified in the config.txt, and set the Security box to 'Trusted'. Then press
GO and the server should start up and be ready to join.
-================================================================================
-UPDATING
-================================================================================
+---
+
+### UPDATING
To update an existing installation, first back up your /config and /data folders
as these store your server configuration, player preferences and banlist.
@@ -68,19 +66,19 @@ install, overwriting when prompted except if we've specified otherwise, and
recompile the game. Once you start the server up again, you should be running
the new version.
-================================================================================
-SQL Setup
-================================================================================
+---
+
+### SQL Setup
The SQL backend for the library and stats tracking requires a
MySQL server. Your server details go in /config/dbconfig.txt, and the SQL
schema is in /SQL/tgstation_schema.sql. More detailed setup instructions are
coming soon, for now ask in our IRC channel.
-================================================================================
-IRC Bot Setup
-================================================================================
+---
-Included in the SVN is an IRC bot capable of relaying adminhelps to a specified
+### IRC Bot Setup
+
+Included in the repo is an IRC bot capable of relaying adminhelps to a specified
IRC channel/server (thanks to Skibiliano). Instructions for bot setup are
-included in the /bot/ folder along with the bot/relay script itself.
\ No newline at end of file
+included in the /bot/ folder along with the bot/relay script itself.
diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
index 26dc82033ad..1425ed8d776 100644
--- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -1,6 +1,14 @@
//node1, air1, network1 correspond to input
//node2, air2, network2 correspond to output
+#define CIRCULATOR_MIN_PRESSURE 10 //KPA to move the mechanism
+#define CIRCULATOR_VOLUME 100 //Litres
+#define CIRCULATOR_EFFICIENCY 0.65 //Out of 1.
+
+#define TURBINE_EFFICIENCY 0.1 //Uses more power than is generated.
+#define TURBINE_PRESSURE_DIFFERENCE 20 //Simulates a 20KPa difference
+#define GENRATE 800
+
/obj/machinery/atmospherics/binary/circulator
name = "circulator/heat exchanger"
desc = "A gas circulator pump and heat exchanger."
@@ -11,13 +19,19 @@
//var/side = 1 // 1=left 2=right
var/status = 0
+ var/datum/gas_mixture/gas_contents
var/last_pressure_delta = 0
+ var/turbine_pumping = 0 //For when there is not enough pressure difference and we need to induce one or something.
+ var/last_power_generation = 0
density = 1
/obj/machinery/atmospherics/binary/circulator/New()
..()
- desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
+ desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
+ gas_contents = new
+ gas_contents.volume = CIRCULATOR_VOLUME
+
/obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air()
if(!anchored)
@@ -25,40 +39,69 @@
var/output_starting_pressure = air2.return_pressure()
var/input_starting_pressure = air1.return_pressure()
+ var/internal_gas_pressure = gas_contents.return_pressure()
- if(output_starting_pressure >= input_starting_pressure-10)
- //Need at least 10 KPa difference to overcome friction in the mechanism
- last_pressure_delta = 0
- return null
+ var/intake_pressure_delta = input_starting_pressure - internal_gas_pressure
+ var/output_pressure_delta = internal_gas_pressure - output_starting_pressure
+
+ var/pressure_delta = max(intake_pressure_delta, output_pressure_delta, 0)
+
+ last_power_generation = 0
+ //If the turbine is running, we need to consider that.
+ if(turbine_pumping)
+ //Make it use powah
+ if(pressure_delta < TURBINE_PRESSURE_DIFFERENCE)
+ last_power_generation = (pressure_delta - TURBINE_PRESSURE_DIFFERENCE)*(1/TURBINE_EFFICIENCY)
+ pressure_delta = TURBINE_PRESSURE_DIFFERENCE
+
+ //If the force is already above what the turbine can do, shut it off and generate power instead!
+ else
+ turbine_pumping = 0
//Calculate necessary moles to transfer using PV = nRT
- if(air1.temperature>0)
- var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
+ if(air1.temperature > 0)
- var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+ var/transfer_moles = pressure_delta*gas_contents.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
last_pressure_delta = pressure_delta
- //world << "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];"
-
//Actually transfer the gas
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+ //Internal to output.
+ air2.merge(gas_contents.remove(transfer_moles))
+ //Intake to internal.
+ gas_contents.merge(air1.remove(transfer_moles))
+
+ //Update the gas networks.
if(network1)
network1.update = 1
if(network2)
network2.update = 1
- return removed
-
else
last_pressure_delta = 0
+ //Needs at least 10 KPa difference to move the mechanism and make power
+ if(pressure_delta < CIRCULATOR_MIN_PRESSURE)
+ last_pressure_delta = 0
+
+ last_power_generation += pressure_delta*CIRCULATOR_EFFICIENCY
+
+ return gas_contents
+
+
+
+//Used by the TEG to know how much power to use/produce.
+/obj/machinery/atmospherics/binary/circulator/proc/ReturnPowerGeneration()
+ return GENRATE*last_power_generation
+
+
/obj/machinery/atmospherics/binary/circulator/process()
..()
update_icon()
+
/obj/machinery/atmospherics/binary/circulator/update_icon()
if(stat & (BROKEN|NOPOWER) || !anchored)
icon_state = "circ-p"
@@ -105,9 +148,9 @@
else
..()
-/obj/machinery/atmospherics/binary/circulator/verb/rotate()
+/obj/machinery/atmospherics/binary/circulator/verb/rotate_clockwise()
set category = "Object"
- set name = "Rotate Circulator"
+ set name = "Rotate Circulator (Clockwise)"
set src in view(1)
if (usr.stat || usr.restrained() || anchored)
@@ -115,3 +158,15 @@
src.dir = turn(src.dir, 90)
desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
+
+
+/obj/machinery/atmospherics/binary/circulator/verb/rotate_anticlockwise()
+ set category = "Object"
+ set name = "Rotate Circulator (Counterclockwise)"
+ set src in view(1)
+
+ if (usr.stat || usr.restrained() || anchored)
+ return
+
+ src.dir = turn(src.dir, -90)
+ desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
\ No newline at end of file
diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
index 590ee66b2f0..4d4c28d17ad 100644
--- a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
@@ -101,7 +101,11 @@
if("change_code")
var/attempt_code = input("Re-enter the current EFTPOS access code", "Confirm old EFTPOS code") as num
if(attempt_code == access_code)
- access_code = input("Enter a new access code for this device", "Enter new EFTPOS code") as num
+ var/trycode = input("Enter a new access code for this device (4-6 digits, numbers only)", "Enter new EFTPOS code") as num
+ if(trycode >= 1000 && trycode <= 999999)
+ access_code = trycode
+ else
+ alert("That is not a valid code!")
print_reference()
else
usr << "\icon[src]Incorrect code entered."
@@ -124,7 +128,11 @@
if("trans_purpose")
transaction_purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose")
if("trans_value")
- transaction_amount = input("Enter amount for EFTPOS transaction", "Transaction amount") as num
+ var/try_num = input("Enter amount for EFTPOS transaction", "Transaction amount") as num
+ if(try_num < 0)
+ alert("That is not a valid amount!")
+ else
+ transaction_amount = try_num
if("toggle_lock")
if(transaction_locked)
var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num
diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
index d03e8f366fa..8463f45e937 100644
--- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
+++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
@@ -150,11 +150,10 @@
var/strength_change = target_field_strength - E.strength
if(strength_change > stored_renwicks)
strength_change = stored_renwicks
- if(E.strength >= 1)
- E.Strengthen(strength_change)
- else if(E.strength < 0)
+ if(E.strength < 0)
E.strength = 0
- E.Strengthen(0.1)
+ else
+ E.Strengthen(strength_change)
stored_renwicks -= strength_change
diff --git a/code/WorkInProgress/Mini/ATM.dm b/code/WorkInProgress/Mini/ATM.dm
index 9578c3a2a3d..15aa916efe7 100644
--- a/code/WorkInProgress/Mini/ATM.dm
+++ b/code/WorkInProgress/Mini/ATM.dm
@@ -206,10 +206,12 @@ log transactions
switch(href_list["choice"])
if("transfer")
if(authenticated_account && linked_db)
- var/target_account_number = text2num(href_list["target_acc_number"])
var/transfer_amount = text2num(href_list["funds_amount"])
- var/transfer_purpose = href_list["purpose"]
- if(transfer_amount <= authenticated_account.money)
+ if(transfer_amount <= 0)
+ alert("That is not a valid amount.")
+ else if(transfer_amount <= authenticated_account.money)
+ var/target_account_number = text2num(href_list["target_acc_number"])
+ var/transfer_purpose = href_list["purpose"]
if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount))
usr << "\icon[src]Funds transfer successful."
authenticated_account.money -= transfer_amount
@@ -284,7 +286,9 @@ log transactions
previous_account_number = tried_account_num
if("withdrawal")
var/amount = max(text2num(href_list["funds_amount"]),0)
- if(authenticated_account && amount > 0)
+ if(amount <= 0)
+ alert("That is not a valid amount.")
+ else if(authenticated_account && amount > 0)
if(amount <= authenticated_account.money)
playsound(src, 'chime.ogg', 50, 1)
diff --git a/code/ZAS/Functions.dm b/code/ZAS/Functions.dm
index 3224b501776..0394c6eff79 100644
--- a/code/ZAS/Functions.dm
+++ b/code/ZAS/Functions.dm
@@ -63,6 +63,10 @@ proc/FloodFill(turf/simulated/start)
proc/ZMerge(zone/A,zone/B)
+
+ if(!istype(A) || !istype(B))
+ return
+
//Merges two zones so that they are one.
var
a_size = A.air.group_multiplier
diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm
index efd7e211748..aa444628d9b 100644
--- a/code/ZAS/Plasma.dm
+++ b/code/ZAS/Plasma.dm
@@ -155,6 +155,8 @@ turf/Entered(obj/item/I)
//Items that are in plasma, but not on a mob, can still be contaminated.
if(istype(I) && vsc.plc.CLOTH_CONTAMINATION)
var/datum/gas_mixture/env = return_air(1)
+ if(!env)
+ return
if(env.toxins > MOLES_PLASMA_VISIBLE + 1)
if(I.can_contaminate())
I.contaminate()
\ No newline at end of file
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index a47721d904a..70dfd1c5e3d 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -132,6 +132,9 @@ datum/controller/vote
restart = 1
else
master_mode = .
+ if(!going)
+ going = 1
+ world << "The round will start soon."
if("crew_transfer")
if(. == "Initiate Crew Transfer")
init_shift_change(null, 1)
@@ -194,9 +197,14 @@ datum/controller/vote
var/text = "[capitalize(mode)] vote started by [initiator]."
if(mode == "custom")
text += "\n[question]"
+
log_vote(text)
world << "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote."
world << sound('misc/bloblarm.ogg')
+ if(mode == "gamemode" && going)
+ going = 0
+ world << "Round start has been delayed."
+
time_remaining = round(config.vote_period/10)
return 1
return 0
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 19f481c96f5..d435e55f793 100755
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -662,6 +662,24 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_armory
group = "Security"
+/datum/supply_packs/shotgunammo
+ name = "Shotgun shells"
+ contains = list(/obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun,
+ /obj/item/ammo_casing/shotgun)
+ cost = 20
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Shotgun shells"
+ access = access_armory
+ group = "Security"
+
/datum/supply_packs/expenergy
name = "Experimental energy gear crate"
contains = list(/obj/item/clothing/suit/armor/laserproof,
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index b2972d2ff2a..f8b743eb701 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -107,7 +107,7 @@ var/list/sacrificed = list()
M.visible_message("\red [M] writhes in pain as the markings below him glow a bloody red.", \
"\red AAAAAAHHHH!.", \
"\red You hear an anguished scream.")
- if(is_convertable_to_cult(M.mind))
+ if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument
ticker.mode.add_cultist(M.mind)
M.mind.special_role = "Cultist"
M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
@@ -370,6 +370,8 @@ var/list/sacrificed = list()
break
if(!ghost)
return this_rune.fizzle()
+ if(jobban_isbanned(ghost, "cultist"))
+ return this_rune.fizzle()
usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!")
var/mob/living/carbon/human/dummy/D = new(this_rune.loc)
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index f705a6cfc6d..38cb9d10be7 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -24,7 +24,6 @@
U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U)
H.equip_to_slot_or_del(U, slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
- //H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index ba17a2bb4b9..1dea42fe849 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -389,6 +389,13 @@ var/global/datum/controller/occupations/job_master
spawnId(H, rank, alt_title)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears)
+
+ //Gives glasses to the vision impaired
+ if(H.disabilities & NEARSIGHTED)
+ var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses)
+ if(equipped != 1)
+ var/obj/item/clothing/glasses/G = H.glasses
+ G.prescription = 1
// H.update_icons()
return 1
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 5b0be916c35..026ddb77f5f 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -14,8 +14,8 @@
if (istype(M,/mob/living/silicon/robot)) //Repairing cyborgs
var/mob/living/silicon/robot/R = M
if (R.getBruteLoss() || R.getFireLoss() )
- R.adjustBruteLoss(-60)
- R.adjustFireLoss(-60)
+ R.adjustBruteLoss(-15)
+ R.adjustFireLoss(-15)
R.updatehealth()
use(1)
user.visible_message("\The [user] applied some [src] at [R]'s damaged areas.",\
@@ -28,7 +28,7 @@
var/datum/organ/external/S = H.get_organ(user.zone_sel.selecting)
if (S && (S.status & ORGAN_ROBOT))
if(S.get_damage())
- S.heal_damage(30, 30, robo_repair = 1)
+ S.heal_damage(15, 15, robo_repair = 1)
H.updatehealth()
use(1)
user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].",\
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6c3814a8010..dd4d2662a7d 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -556,6 +556,7 @@
name = "toy phazon"
desc = "Mini-Mecha action figure! Collect them all! 11/11."
icon_state = "phazonprize"
+
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
@@ -575,4 +576,4 @@
desc = "This baby looks almost real. Wait, did it just burp?"
force = 5
w_class = 4.0
- slot_flags = SLOT_BACK
+ slot_flags = SLOT_BACK
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a5874f09855..1369bb15759 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -106,6 +106,7 @@
can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
allow_quick_gather = 1
use_to_pickup = 1
+ storage_slots = 14
/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index b45a8431241..f6ad799900d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -16,7 +16,7 @@
else
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/clothing/suit/captunic(src)
- new /obj/item/clothing/suit/captunic/trek(src)
+ new /obj/item/clothing/suit/captunic/capjacket(src)
new /obj/item/clothing/head/helmet/cap(src)
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/suit/armor/vest(src)
@@ -46,18 +46,41 @@
New()
..()
sleep(2)
- new /obj/item/clothing/under/rank/head_of_personnel(src)
+ new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/weapon/cartridge/hop(src)
new /obj/item/device/radio/headset/heads/hop(src)
- new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/storage/box/ids(src)
new /obj/item/weapon/storage/box/ids( src )
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/device/flash(src)
- new /obj/item/clothing/glasses/sunglasses(src)
+ return
+
+/obj/structure/closet/secure_closet/hop2
+ name = "Head of Personnel's Attire"
+ req_access = list(access_hop)
+ icon_state = "hopsecure1"
+ icon_closed = "hopsecure"
+ icon_locked = "hopsecure1"
+ icon_opened = "hopsecureopen"
+ icon_broken = "hopsecurebroken"
+ icon_off = "hopsecureoff"
+
+ New()
+ ..()
+ sleep(2)
+ new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/under/dress/dress_hop(src)
+ new /obj/item/clothing/under/dress/dress_hr(src)
+ new /obj/item/clothing/under/lawyer/female(src)
+ new /obj/item/clothing/under/lawyer/black(src)
+ new /obj/item/clothing/under/lawyer/red(src)
+ new /obj/item/clothing/under/lawyer/oldman(src)
+ new /obj/item/clothing/shoes/brown(src)
+ new /obj/item/clothing/shoes/black(src)
+ new /obj/item/clothing/shoes/leather(src)
+ new /obj/item/clothing/shoes/white(src)
return
diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm
index eebe9fb343c..83df96a7280 100644
--- a/code/game/objects/structures/lamarr_cage.dm
+++ b/code/game/objects/structures/lamarr_cage.dm
@@ -89,9 +89,16 @@
/obj/structure/lamarr/proc/Break()
if(occupied)
- var/obj/item/clothing/mask/facehugger/A = new /obj/item/clothing/mask/facehugger( src.loc )
- A.sterile = 1
- A.name = "Lamarr"
+ new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
occupied = 0
update_icon()
+ return
+
+/obj/item/clothing/mask/facehugger/lamarr
+ name = "Lamarr"
+ desc = "The worst she might do is attempt to... couple with your head."//hope we don't get sued over a harmless reference, rite?
+ sterile = 1
+ gender = FEMALE
+
+/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
return
\ No newline at end of file
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 9064b51c930..28791229725 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -105,12 +105,12 @@
if(reinf) new /obj/item/stack/rods(loc)
del(src)
else if (usr.a_intent == "hurt")
- playsound(src.loc, 'Glassknock.ogg', 80, 1)
+ playsound(src.loc, 'glassknock.ogg', 80, 1)
usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
"\red You bang against the [src.name]!", \
"You hear a banging sound.")
else
- playsound(src.loc, 'Glassknock.ogg', 80, 1)
+ playsound(src.loc, 'glassknock.ogg', 80, 1)
usr.visible_message("[usr.name] knocks on the [src.name].", \
"You knock on the [src.name].", \
"You hear a knocking sound.")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 7dd3407ce79..292327ca274 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -10,7 +10,7 @@
switch(href_list["makeAntag"])
if("1")
log_admin("[key_name(usr)] has spawned a traitor.")
- if(!src.makeTratiors())
+ if(!src.makeTraitors())
usr << "\red Unfortunatly there were no candidates available"
if("2")
log_admin("[key_name(usr)] has spawned a changeling.")
diff --git a/code/modules/admin/verbs/check_customitem_activity.dm b/code/modules/admin/verbs/check_customitem_activity.dm
index a39ce0fd535..1bda56c6e58 100644
--- a/code/modules/admin/verbs/check_customitem_activity.dm
+++ b/code/modules/admin/verbs/check_customitem_activity.dm
@@ -55,7 +55,7 @@ var/inactive_keys = "None
"
//run a query to get all ckeys inactive for over 2 months
var/list/inactive_ckeys = list()
if(ckeys_with_customitems.len)
- var/DBQuery/query_inactive = dbcon.NewQuery("SELECT ckey, lastseen FROM erro_player WHERE datediff(Now(),lastseen) > 2")
+ var/DBQuery/query_inactive = dbcon.NewQuery("SELECT ckey, lastseen FROM erro_player WHERE datediff(Now(), lastseen) > 60")
query_inactive.Execute()
while(query_inactive.NextRow())
var/cur_ckey = query_inactive.item[1]
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 809302387a0..8ef53eb0232 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -11,7 +11,7 @@ client/proc/one_click_antag()
/datum/admins/proc/one_click_antag()
var/dat = {"One-click Antagonist
- Make Tratiors
+ Make Traitors
Make Changlings
Make Revs
Make Cult
@@ -53,7 +53,7 @@ client/proc/one_click_antag()
return 0
-/datum/admins/proc/makeTratiors()
+/datum/admins/proc/makeTraitors()
var/datum/game_mode/traitor/temp = new
if(config.protect_roles_from_antagonist)
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 8757ad0d4f9..a12672bf52a 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -2,7 +2,7 @@
//SECURITY//
////////////
#define TOPIC_SPAM_DELAY 4 //4 ticks is about 3/10ths of a second
-#define UPLOAD_LIMIT 1048576 //Restricts client uploads to the server to 1MB //Could probably do with being lower.
+#define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
#define MIN_CLIENT_VERSION 0 //Just an ambiguously low version for now, I don't want to suddenly stop people playing.
//I would just like the code ready should it ever need to be used.
/*
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 8a21fc6b6ce..4799dcffbc4 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -252,6 +252,7 @@ datum/preferences
dat += "Blood Type: [b_type]
"
dat += "Skin Tone: [-s_tone + 35]/220
"
//dat += "Skin pattern: Adjust
"
+ dat += "Needs Glasses: [disabilities == 0 ? "No" : "Yes"]
"
dat += "Limbs: Adjust
"
//display limbs below
@@ -1008,6 +1009,9 @@ datum/preferences
else
gender = MALE
+ if("disabilities") //please note: current code only allows nearsightedness as a disability
+ disabilities = !disabilities//if you want to add actual disabilities, code that selects them should be here
+
if("hear_adminhelps")
toggles ^= SOUND_ADMINHELP
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index f60a5409da9..4a4d49d25fb 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -237,6 +237,7 @@
S["sec_record"] << sec_record
S["player_alt_titles"] << player_alt_titles
S["be_special"] << be_special
+ S["disabilities"] << disabilities
S["used_skillpoints"] << used_skillpoints
S["skills"] << skills
S["skill_specialization"] << skill_specialization
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 751dde212c9..88349d20753 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1,6 +1,7 @@
/obj/item/clothing
name = "clothing"
+
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index f5fef1be70e..5795e8c7141 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -19,6 +19,8 @@
vision_flags = SEE_TURFS
/obj/item/clothing/glasses/meson/prescription
+ name = "prescription mesons"
+ desc = "Optical Meson Scanner with prescription lenses."
prescription = 1
/obj/item/clothing/glasses/science
@@ -61,6 +63,7 @@
desc = "Made by Nerd. Co."
icon_state = "glasses"
item_state = "glasses"
+ prescription = 1
/obj/item/clothing/glasses/regular/hipster
name = "Prescription Glasses"
@@ -114,6 +117,13 @@
usr.update_inv_glasses()
+/obj/item/clothing/glasses/welding/superior
+ name = "superior welding goggles"
+ desc = "Welding goggles made from more expensive materials, strangely smells like potatoes."
+ icon_state = "rwelding-g"
+ item_state = "rwelding-g"
+ icon_action_button = "action_welding_g"
+
/obj/item/clothing/glasses/sunglasses/blindfold
name = "blindfold"
desc = "Covers the eyes, preventing sight."
@@ -122,6 +132,7 @@
vision_flags = BLIND
/obj/item/clothing/glasses/sunglasses/prescription
+ name = "prescription sunglasses"
prescription = 1
/obj/item/clothing/glasses/sunglasses/big
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 93651764173..41ba7dd82a2 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -21,10 +21,13 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
-/obj/item/clothing/suit/captunic/trek
+/obj/item/clothing/suit/captunic/capjacket
name = "captain's uniform jacket"
desc = "A less formal jacket for everyday captain use."
icon_state = "capjacket"
+ item_state = "bio_suit"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ flags_inv = HIDEJUMPSUIT
//Chaplain
/obj/item/clothing/suit/chaplain_hoodie
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 91ad33c20da..577ae6bbe35 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -295,6 +295,12 @@
icon_state = "dress_hop"
color = "dress_hop"
+/obj/item/clothing/under/dress/dress_hr
+ name = "human resources director uniform"
+ desc = "Superior class for the nosy H.R. Director."
+ icon_state = "huresource"
+ color = "huresource"
+
/obj/item/clothing/under/dress/plaid_blue
name = "blue plaid skirt"
desc = "A preppy blue skirt with a white blouse."
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index c6482846e03..ff80b7bd0c0 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -135,6 +135,14 @@ hi
icon_on = "bluezippoon"
icon_off = "bluezippo"
+/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
+ name = "engraved lighter"
+ desc = "A golden lighter, engraved with some ornaments and a G."
+ icon = 'custom_items.dmi'
+ icon_state = "guessip"
+ icon_on = "guessipon"
+ icon_off = "guessip"
+
/obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
name = "Riley's black zippo"
desc = "A black zippo lighter, which holds some form of sentimental value."
@@ -466,6 +474,12 @@ hi
desc = "Much safer than a hard helmet."
icon = 'custom_items.dmi'
icon_state = "neilpatterson0_hat"
+
+/obj/item/clothing/head/fluff/krinnhat //Shirotyrant: Krinn Seeskale
+ name = "saucepan hat"
+ desc = "This hat is the shiniest shiny Krinn has ever owned."
+ icon = 'custom_items.dmi'
+ icon_state = "krinn_hat"
//////////// Suits ////////////
/obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
@@ -503,6 +517,13 @@ hi
icon_state = "deus_blueshield"
item_state = "deus_blueshield"
+/obj/item/clothing/suit/fluff/oldscarf //Writerer2: Javaria Zara
+ name = "old scarf"
+ desc = "An old looking scarf, it seems to be fairly worn."
+ icon_state = "mantle-unathi"
+ item_state = "mantle-unathi"
+ body_parts_covered = UPPER_TORSO
+
//////////// Uniforms ////////////
/obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 7eca9638fc5..a905e5d90aa 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -97,6 +97,7 @@
return
/mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
+ if(status_flags & GODMODE) return 0 //godmode
shock_damage *= siemens_coeff
if (shock_damage<1)
return 0
@@ -384,13 +385,13 @@
item.layer = initial(item.layer)
u_equip(item)
update_icons()
- //if(src.client)
- //src.client.screen -= item
- //item.loc = src.loc
-
- //if(istype(item, /obj/item))
- //item:dropped(src) // let it know it's been dropped
+ if (istype(usr, /mob/living/carbon/monkey)) //Check if a monkey is throwing. Modify/remove this line as required.
+ item.loc = src.loc
+ if(src.client)
+ src.client.screen -= item
+ if(istype(item, /obj/item))
+ item:dropped(src) // let it know it's been dropped
//actually throw it!
if (item)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index ae58b2fbcf4..5221d779791 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -450,6 +450,7 @@
SA.moles = 0
if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
+ if(status_flags & GODMODE) return 1 //godmode
if(breath.temperature < 260.15)
if(prob(20))
src << "\red You feel your face freezing and an icicle forming in your lungs!"
@@ -518,6 +519,7 @@
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
//Body temperature is too hot.
fire_alert = max(fire_alert, 1)
+ if(status_flags & GODMODE) return 1 //godmode
switch(bodytemperature)
if(360 to 400)
apply_damage(HEAT_DAMAGE_LEVEL_1, BURN, used_weapon = "High Body Temperature")
@@ -531,6 +533,7 @@
else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
fire_alert = max(fire_alert, 1)
+ if(status_flags & GODMODE) return 1 //godmode
if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
switch(bodytemperature)
if(200 to 260)
@@ -548,6 +551,7 @@
var/pressure = environment.return_pressure()
var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
+ if(status_flags & GODMODE) return 1 //godmode
switch(adjusted_pressure)
if(HAZARD_HIGH_PRESSURE to INFINITY)
adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
@@ -783,8 +787,8 @@
var/total_plasmaloss = 0
for(var/obj/item/I in src)
if(I.contaminated)
- total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
-
+ total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
+ if(status_flags & GODMODE) return 0 //godmode
adjustToxLoss(total_plasmaloss)
// if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
@@ -1223,8 +1227,14 @@
if(blinded) blind.layer = 18
else blind.layer = 0
- if( disabilities & NEARSIGHTED && !istype(glasses, /obj/item/clothing/glasses/regular) )
- client.screen += global_hud.vimpaired
+ if(disabilities & NEARSIGHTED) //this looks meh but saves a lot of memory by not requiring to add var/prescription
+ if(glasses) //to every /obj/item
+ var/obj/item/clothing/glasses/G = glasses
+ if(!G.prescription)
+ client.screen += global_hud.vimpaired
+ else
+ client.screen += global_hud.vimpaired
+
if(eye_blurry) client.screen += global_hud.blurry
if(druggy) client.screen += global_hud.druggy
@@ -1270,6 +1280,7 @@
playsound_local(src,pick(scarySounds),50, 1, -1)
proc/handle_virus_updates()
+ if(status_flags & GODMODE) return 0 //godmode
if(bodytemperature > 406)
for(var/datum/disease/D in viruses)
D.cure()
@@ -1319,7 +1330,7 @@
handle_shock()
..()
-
+ if(status_flags & GODMODE) return 0 //godmode
if(analgesic) return // analgesic avoids all traumatic shock temporarily
if(health < 0)// health 0 makes you immediately collapse
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c7aab1d9ed9..162a69b49c7 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -228,6 +228,7 @@
// damage ONE external organ, organ gets randomly selected from damaged ones.
/mob/living/proc/take_organ_damage(var/brute, var/burn)
+ if(status_flags & GODMODE) return 0 //godmode
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()
@@ -240,6 +241,7 @@
// damage MANY external organs, in random order
/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
+ if(status_flags & GODMODE) return 0 //godmode
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 94fc27ba8d8..de8f271c6c8 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -234,16 +234,12 @@ var/list/ai_list = list()
/mob/living/silicon/ai/proc/ai_roster()
set category = "AI Commands"
set name = "Show Crew Manifest"
- var/dat = "Crew RosterCrew Roster:
"
-
- var/list/L = list()
- for (var/datum/data/record/t in data_core.general)
- var/R = t.fields["name"] + " - " + t.fields["rank"]
- L += R
- for(var/R in sortList(L))
- dat += "[R]
"
- dat += ""
+ var/dat
+ dat += "Crew Manifest
"
+ if(data_core)
+ dat += data_core.get_manifest(0) // make it monochrome
+ dat += "
"
src << browse(dat, "window=airoster")
onclose(src, "airoster")
@@ -743,4 +739,4 @@ var/list/ai_list = list()
anchored = 1
return
else
- return ..()
+ return ..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 139d65765b5..27d557c70cc 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -413,14 +413,9 @@
/mob/living/silicon/pai/proc/softwareManifest()
var/dat = ""
dat += "Crew Manifest
"
- var/list/L = list()
- if(!isnull(data_core.general))
- for (var/datum/data/record/t in sortRecord(data_core.general))
- var/R = t.fields["name"] + " - " + t.fields["rank"]
- L += R
- for(var/R in sortList(L))
- dat += "[R]
"
- dat += "