Commit Graph

9448 Commits

Author SHA1 Message Date
Zuhayr
cd0bf9622d Merge pull request #8557 from Baystation12/dev-freeze
Dev freeze
2015-03-21 11:03:58 +10:30
PsiOmega
273bb366f0 AI laws now refer to crew members instead of humans.
Notable exception: Asimov's laws remain true to the original.
2015-03-20 16:20:41 +01:00
Zuhayr
87fe7d80f0 Merge pull request #8542 from PsiOmegaDelta/IWasFrozenToday
Cryopod naming fixes.
2015-03-20 21:00:07 +10:30
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
PsiOmega
3d9d05afce Fixes #8107.
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
PsiOmega
44c8b03fcd Cryopod naming fixes.
Fixes issue where the cryopod name would not update if left willingly.
Fixes issue where the cryopod name would not update if forced inside.
2015-03-19 20:10:51 +01:00
PsiOmega
1f5de7f64f Ports /tg/ & Paradise ghost sight.
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
2015-03-19 16:14:02 +01:00
Chinsky
be8e76a01e Merge pull request #8535 from Kelenius/ofCandlesAndTime
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius
cc9f15dd67 Makes candles last longer 2015-03-18 20:57:51 +03:00
Vivalas
1040ffbede Fixes #8519
Gives CMO EVA access, like they should have.
2015-03-18 09:06:01 -05:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
Ravensdale
2201ab21d4 Makes radiation shielded an area flag 2015-03-17 18:54:45 -07:00
Zuhayr
961272817f Merge pull request #8461 from comma/biofluff
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
Chinsky
158a2731e3 Merge pull request #8335 from GinjaNinja32/reagent_dispenser
Reagent dispenser rework
2015-03-17 10:05:18 +03:00
Chinsky
376657bdd7 Merge pull request #8353 from Glloyd/goonschedu
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmegaDelta
d6bff0a50b Merge pull request #8502 from Techhead0/dev
Botany tool construction and clippers
2015-03-17 07:46:03 +01:00
PsiOmega
7f68403ae4 NanoUI - Silicon law manager
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00:00
Techhead0
073f0f1c4a Adds Tactical Knife
Found under Arms & Ammo for hacked autolathes.
2015-03-16 09:38:36 -04:00
PsiOmega
a1cbc80ed3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-16 12:39:32 +01:00
PsiOmega
172110b582 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-16 12:37:43 +01:00
Techhead0
2ca80a06b9 Botany tool construction and clippers
Adds hatchets and mini hoes to the autolathe recipe list. Material costs
are unchanged. Also adds plant clippers (reskinned wirecutters) to
secure hydroponics lockers.
2015-03-15 19:15:35 -04:00
Chinsky
1ead71a993 Merge pull request #8479 from Techhead0/dev
More things in belts.
2015-03-15 04:50:03 +03:00
Zuhayr
c0185546e0 Merge pull request #8459 from comma/cryosprite
Cryo will now show occupant inside on sprite.
2015-03-15 12:15:27 +10:30
Daniel García Baldomir
2e571e5448 Pass at removing empty process() on game/machinery 2015-03-14 21:38:23 +01:00
Daniel García Baldomir
a50bebcbae Added check for use_power in machinery.dm process 2015-03-14 21:07:55 +01:00
Techhead0
020e1e4c60 Tweaks.
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
Daniel García Baldomir
1c67f811a7 Updated power usage of the Autholathe. 2015-03-14 20:46:41 +01:00
Daniel García Baldomir
9e464d823f Added process to robo-fabs and teleporter. 2015-03-14 20:06:52 +01:00
Daniel García Baldomir
78798e7548 Added process on machines A to J. Changed some world iterations to machines iterations. 2015-03-14 19:45:34 +01:00
Techhead0
d4e46182af More things in belts.
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
2015-03-14 14:38:30 -04:00
Daniel García Baldomir
8e5751a632 Bodyscanner : idle 60, active 10k 2015-03-14 19:27:36 +01:00
Chinsky
ba18611bb3 Added support for multiple cloning vats per single console.
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
2015-03-13 13:21:19 +03:00
Chinsky
149bf70e3e Soulstones now require victim to actually be dead or maimed, as message says, instead of just sleeping.
Also shades now get their former icon and stuff like ghosts, for maximum spooky.
2015-03-13 13:16:59 +03:00
Chinsky
f03759a246 Fixes organ bioprinter and the organs. Now less debuggy and less buggy too. 2015-03-13 12:24:27 +03:00
Chinsky
a51f776f4d Cryo will now show occupant inside on sprite. 2015-03-13 12:22:08 +03:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr
a72b94e3f8 Merge pull request #8432 from PsiOmegaDelta/WanderingNano
Fixes #8264
2015-03-11 08:08:04 +10:30
PsiOmega
373921fa44 Fixes #8264.
updateUsrDialog() doesn't play well with nanoUI, forcing it to re-open and reposition on each cal.
2015-03-10 14:06:05 +01:00
PsiOmega
533ccef0ab Robot code clean up and fixes.
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
d3d9e0b2ed Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 12:48:27 +01:00
Zuhayr
34c015cbbe Merge pull request #8424 from mwerezak/exosuit
Allows removing exosuit pilots using maintenance protocols
2015-03-10 18:54:07 +10:30
PsiOmega
9fdd3ccbdf Can now destroy/delete the suit cycler. 2015-03-10 09:08:52 +01:00
PsiOmega
85641b46e5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 07:58:25 +01:00
mwerezak
3de6374b4a Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.
Enable maintenance protocols -> wrench -> crowbar -> multitool.
2015-03-10 02:47:54 -04:00
Chinsky
9c30024ca0 Merge pull request #8411 from volas/admin_stuff
Some admin stuff
2015-03-10 09:09:35 +03:00