Chinsky
056c00fc9a
Merge pull request #8671 from Yoshax/spellfixes
...
Updates spellbook descriptions and cooldowns
2015-03-30 21:15:08 +03:00
Yosh
c1b7ca3b89
Further description fixes
2015-03-30 01:17:57 +01:00
Yosh
e9125474dd
Spellbook spell description update
...
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43
Spellbook cooldown corrections
...
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
Yosh
42cb430f02
Changes ED-209 Construction to work with new armor vests
...
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
2015-03-29 18:05:07 +01:00
mwerezak
fb53dd7402
Fixes holopad not checking other holograms being projected from the same projector, if the first one was in range.
...
Simplifies holopad power usage.
2015-03-27 10:31:44 -04:00
PsiOmega
b39a486e61
Fixes duplicate uplink reference.
...
This is the second time I have to fix it for the rifle. Stop breaking it.
2015-03-25 23:14:02 +01:00
PsiOmegaDelta
447cbab45f
Merge pull request #8613 from mwerezak/gun-rewrite
...
Adjusts ammo autolathe costs
2015-03-24 21:54:49 +01:00
Zuhayr
0bb2cd835c
Merge pull request #8600 from mwerezak/bread-tube
...
Adds bread tube trash item, merc shuttle vendor
2015-03-25 00:54:16 +10:30
mwerezak
1ce81b91b1
Adds bread tube trash item
2015-03-24 04:03:06 -04:00
Zuhayr
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
mwerezak
8ff15108f9
Reduces 14.5mm ammo box cost to 2 TC, slight rename
2015-03-23 00:16:48 -04:00
mwerezak
a60921326e
Adjusts ammunition autolathe costs, makes 7.62 mags printable
2015-03-23 00:06:28 -04:00
Zuhayr
a454e77444
Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
...
Fixes stray character.
2015-03-23 10:55:08 +10:30
PsiOmega
9286f10a35
Fixes stray character.
2015-03-22 18:45:03 +01:00
Zuhayr
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
Zuhayr
87fe7d80f0
Merge pull request #8542 from PsiOmegaDelta/IWasFrozenToday
...
Cryopod naming fixes.
2015-03-20 21:00:07 +10:30
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
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
Zuhayr
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
PsiOmega
172110b582
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-16 12:37:43 +01:00
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
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
Daniel García Baldomir
8e5751a632
Bodyscanner : idle 60, active 10k
2015-03-14 19:27:36 +01:00
Chinsky
f03759a246
Fixes organ bioprinter and the organs. Now less debuggy and less buggy too.
2015-03-13 12:24:27 +03:00
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
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
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
