Commit Graph

9974 Commits

Author SHA1 Message Date
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
Zuhayr
277ceea894 Merge pull request #8405 from PsiOmegaDelta/StationAlertRuntime
Station Alert Runtime Fix
2015-03-10 09:30:57 +10:30
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix
Examine fix
2015-03-10 09:30:51 +10:30
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
Daniel García Baldomir
2fa6bb9ab2 Fixes mass driver not being registered on machines. 2015-03-09 21:54:38 +01:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack
More tweaks
2015-03-09 23:28:15 +03:00
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
Chinsky
d433ccead2 Merge pull request #8412 from Neerti/3-9-2015_air_alarm_nano_shrink
Makes the width of the nanoUI for air alarms smaller.
2015-03-09 22:13:19 +03:00
Chinsky
ec9511c943 Merge pull request #8402 from PsiOmegaDelta/RemoteAir
Fixes various alarm issues.
2015-03-09 22:07:02 +03:00
PsiOmega
57c0591283 Fixes ninja spawn logic.
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
mwerezak
b60a045d70 Fixes door runtime, removes user = null hack 2015-03-09 12:43:10 -04:00
mwerezak
385ff4f2fa Examine tab modularity
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
26cb0fe2c6 Fixes medical records laptop runtime 2015-03-09 12:04:04 -04:00
volas
e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff
Conflicts:
	code/modules/admin/admin_verbs.dm
2015-03-09 18:11:10 +03:00
Neerti
c03535f03d Makes the width of the nanoUI for air alarms smaller. 2015-03-09 11:07:21 -04:00
volas
515fdc9f6e 'Who' verb now shows the age of players on the server for admins 2015-03-09 14:20:31 +03:00
Chinsky
d8c2a36f9f Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +03:00
Loganbacca
11d340f898 Projectile effects - Part 3
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
mwerezak
b71f6c1121 Partial breathing refactor
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
PsiOmega
6cca0b6169 Station Alert Runtime Fix
Fixes an issue where station alert consoles could potentially runtime due to alarm_monitor not yet being initialized.
2015-03-08 23:02:29 +01:00
PsiOmega
e05e024cc5 Fixes issues with remote air alarm access. 2015-03-08 18:31:59 +01:00
PsiOmega
cfbba5c153 Station alert monitor should now only react to major alarms. 2015-03-08 17:58:48 +01:00