Commit Graph

712 Commits

Author SHA1 Message Date
Jamini 920b855f6c Added employment records.
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.

Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-07-24 22:23:50 -04:00
Mloc-Argent cf53dd7a10 Revert "Adds in the Kida"
This reverts commit a2fddc0fc1.
2013-07-12 12:22:35 +01:00
Spamcat 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
Conflicts:
	code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
Spamcat 10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Kilakk 1bce99656c Fixes crew manifests showing alt titles as misc 2013-06-23 13:26:25 -04:00
Zuhayr b41b1fc2f3 Armalis simple_animal/sprite. 2013-06-15 04:09:49 -07:00
Jim "Apples" 6d1d50ed69 Merge pull request #3067 from NicholasDV/enhancementsAndFeatures
Adds in the Kida
2013-06-14 10:33:23 -07:00
Jamini 89766706fe Alien Monkeys - Farwa, Stok, Aenera
Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-06-14 02:22:27 -04:00
NicholasDV a2fddc0fc1 Adds in the Kida
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
NicholasDV f304df5b05 Added the ability to give traitors all objectives.
Specifically, admins were unable to give players, traitors,
that is, the objective to brig/maim someone. This gives them
the ability view the traitor panel.
2013-06-09 04:47:10 -04:00
MisterBook e05a20ad6f Putting VOX back in. 2013-06-07 12:31:38 -05:00
MisterBook eab6f4fc44 Taser fix v.3.2
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
Zuhayr 06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
Chinsky 89fff29db1 Showed that huge proc in /atom what polymorphism' is.
Now instead of huge condition line it's handled where it was supposed to be handled.
2013-06-01 12:24:43 +04:00
VitrescentTortoise 9ba719e4e1 Fixed forcewalls. 2013-05-28 18:32:59 -07:00
jediluke69 9d83bd52b5 Added a shotgun shell ammo crate 2013-04-27 21:42:56 -04:00
adammartinez271828 3b95bf2279 Updates to sun.dm and solar.dm
Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer.
2013-04-07 10:17:41 -04:00
Asanadas 0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2013-03-21 02:59:29 -04:00
Chinsky 13b6b2f61b Moved organ and blood code to module folder.
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
2013-03-14 11:52:53 +04:00
Chinsky 28290d4852 Fixes issue with 0 toxloss giving people worst pain message. 2013-03-14 08:56:13 +04:00
Chinsky f36ebe3b9d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-14 05:07:14 +04:00
Chinsky f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky 4c7f1f21d9 Merge pull request #2525 from CIB/feature
Crew transfer votes now have a bias depending on how far into the round.
2013-03-13 16:35:16 -07:00
cib bb0ed9a2ab Toxloss now causes pain. 2013-03-13 17:04:02 +01:00
Chinsky 468defbdfb Made virus crate have virus2 again. 2013-03-13 06:15:56 +04:00
Chinsky 7e82d9064c Head blows now can cause brain damage. 2013-03-11 04:59:24 +04:00
Cael_Aislinn 86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:39:24 +10:00
Cael_Aislinn 20a3596460 re-added missing supply packs (supply packs without assigned groups are not orderable)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 18:45:11 +10:00
Cael_Aislinn 18f6136b25 tweaked a couple of supply packs (crate types, quantities), added missing rust fuel port circuitry supply pack, added supply packs for type 1 TEGs and circulators
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:33:59 +10:00
cib 65b8eafe8e Added internal organs.
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
Cael_Aislinn a7a0e48d67 compile fixes, tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-24 22:06:36 +10:00
Cael_Aislinn 3cc31685c0 fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:51:56 +10:00
Cael_Aislinn 1469ccb7f9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 19:39:05 +10:00
Cael_Aislinn 68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 19:38:50 +10:00
Chinsky 2ce64b77a7 Merge branch 'necrosis' into bleeding-edge-freeze 2013-02-22 23:46:54 +04:00
Chinsky 83eb9cac83 Commented out gangrene for now.
I suck at branches, it got caught with my surgery fixes.
2013-02-22 23:24:33 +04:00
Chinsky f50fd49032 Gangrene!
Now germ level for organ has three thresholds.
LEVEL 1: Occasional (prob(10) every tick) tox damage and germ level raise.
LEVEL 2: In addition to that, tox damage and germ level raise every tick.
LEVEL 3: Limb necrosis. Currently does nothing but icon change. Also at this stage germs start leaking to connected organs, so amputations is necessary.
2013-02-22 23:12:27 +04:00
Cael_Aislinn 8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn 2c585fbcc4 moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 23:49:29 +10:00
Cael_Aislinn 66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 20:00:05 +10:00
Christian Bielert f2b9816810 Merge pull request #2389 from comma/bleeding-edge-freeze
Guns, medicine and fixes.
2013-02-20 13:22:57 -08:00
Zuhayr cdb3907493 Binary file merge conflict. 2013-02-20 00:28:14 -08:00
Zuhayr 1fe4cbb619 Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed. 2013-02-20 00:24:26 -08:00
Chinsky df67151fe3 Merge branch 'master' into bleeding-edge-freeze 2013-02-20 09:18:14 +04:00
Chinsky 3202ac4ccf Fixes runtime with burn wounds not having enough stages. 2013-02-20 00:38:43 +04:00
Chinsky 334da25223 Added surgery to put things in people. 2013-02-18 13:22:23 +04:00
Chinsky baec30f690 Moved procs around, added comments. 2013-02-17 22:06:26 +04:00
Chinsky 24351fbea8 Made all proc declarations full, updated indentation accordingly.
Changed paths for wounds.
2013-02-17 20:31:55 +04:00
Chinsky ab9ed98f07 Removed all cases for monkeys, since they do not have organs anymore.
Moved dropped limb icon generation code to it's New()
2013-02-17 19:38:28 +04:00
Chinsky 92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway.
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
2013-02-17 19:12:00 +04:00