Commit Graph

2980 Commits

Author SHA1 Message Date
Nanai 101459ed49 Replaces Jailbreaker Verte with Warlock's Velvet in the contraband crate. Guarenteed !!!fun!!! 2013-10-21 07:13:04 -04:00
jack-fractal 3732a9c3b9 Adding the dispensers to the cargo lists.
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
2013-10-17 19:48:57 -04:00
Mloc-Argent a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Erthilo 3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
ZipIce 497b050488 Update disease.dm
This will remove some run-time errors, allowing disease to work when the mob has no reagents (new players and simple animals).
2013-09-01 23:42:35 -07:00
Erthilo dc5781f05b Officers can be set as rev. 2013-08-31 22:13:59 +01:00
Erthilo 547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo 5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Zuhayr a697567806 Added abilities for nymphs/evolution to a final form. 2013-08-19 17:22:23 -07:00
Zuhayr b5d89b8929 Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn. 2013-08-07 01:16:38 -07:00
Zuhayr 98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
Zuhayr dec28dda86 Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-08-03 12:41:46 -07:00
Zuhayr 27f7d1580d Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-08-02 20:16:50 -07:00
Segrain d51809faa2 Separating autoinjectors box from injector box. 2013-08-02 19:30:02 +03:00
comma bbdcb81868 Added advanced medikits. 2013-08-01 09:58:09 +04:00
comma c8f5b98a95 Autoinjectors.
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Zuhayr f50256eabb Work progresses on species datums. Mass-commit due to repo issues requiring a reset. 2013-07-31 11:50:56 -07:00
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