Jon
86850d15f4
Fixes the map for NanoUI. It's now 1200x1200px not 1024x1024px due to our dimensions.
...
Necessary changes to nanomapgen.dm and various image files to generate new nanoui maps have not been committed. These changes were required because our station's map is 300x300 tiles, not 255x255 tiles like the Exodus.
Changes were needed to layout_default.css to ensure the map shows properly in the UI at 300x300.
This should work fine for now, but other changes can be pushed through to bring the tools in line with our map's size if necessary.
2015-11-30 20:15:27 +00:00
PsiOmegaDelta
d709363ff7
Radio NanoUI.
...
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369 .
2015-11-22 21:42:54 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
0c3b6c01e2
Radio NanoUI.
...
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369 .
2015-10-16 16:01:36 +02:00
Neerti
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
Chinsky
7d123549ed
Merge pull request #10845 from PsiOmegaDelta/150824-Cargonia
...
Cargo now sorts under their own department in manifests.
2015-09-03 20:38:00 +03:00
Zuhayr
7f97527471
Merge pull request #10581 from Kelenius/ofMechfabAndPanic
...
Updates mechfab
2015-08-31 17:39:04 +09:30
PsiOmega
6165b6fee3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/material/shards.dm
2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f
Merge pull request #10939 from Baystation12/master
...
Dev-freeze
2015-08-30 10:20:32 +02:00
Peliia
a0a8b2865c
Pathogenic Isolator
...
Fixes the Isolator saying "unidentified" for every entry on the List screen.
2015-08-26 16:11:01 +02:00
PsiOmegaDelta
d36d6d42e0
Cargo now sorts under their own department in the manifests.
2015-08-24 10:03:15 +02:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Kelenius
6ba41bbc2a
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
code/__defines/research.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha_parts.dm
code/modules/research/designs.dm
maps/exodus-1.dmm
2015-08-21 16:59:57 +03:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
Kelenius
8fcd18157e
Fixes mechfab manufacturers
2015-08-17 10:42:27 +03:00
Kelenius
3b1c5666d5
Merge branch 'dev' into ofMechfabAndPanic
2015-08-17 09:58:23 +03:00
Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
PsiOmega
0c0a521003
Changelog entry.
2015-08-15 15:25:51 +02:00
PsiOmega
c51e208094
One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686 .
2015-08-15 15:22:37 +02:00
Kelenius
d8d94b9d64
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
code/game/machinery/Sleeper.dm
maps/exodus-1.dmm
2015-08-13 09:20:51 +03:00
Kelenius
012fb38de2
Finalizes mechfab
2015-08-12 21:46:11 +03:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Karolis2011
cc029828bb
Updated old wiki link to a new one.
2015-08-11 17:20:55 +03:00
PsiOmega
570806046b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/custom_sprites.dm
code/modules/organs/organ_stump.dm
code/setup.dm
2015-08-10 17:56:14 +02:00
Kelenius
7562f6f01a
Updates mechfab interface
...
Fixes all bugs I found.
2015-08-10 17:46:03 +03:00
Kelenius
dabcccca6b
Updates mechfab UI
2015-08-09 20:45:39 +03:00
PsiOmega
889f399356
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/area/areas.dm
code/game/machinery/alarm.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
mwerezak
0b7ad4549c
Fixes air alarm nanoui local status
...
Fixes the local status using the wrong danger level
2015-08-09 00:00:12 -04:00
Neerti
d911badae8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
...
Conflicts:
.travis.yml
polaris.dme
2015-08-07 20:25:57 -04:00
Kelenius
210d8fac22
Updates mechfab to not be terrible, WIP
2015-08-07 18:01:12 +03:00
PsiOmegaDelta
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
595b58197d
fix pAI radios not working
2015-08-05 00:49:28 +01:00
Neerti
2ae491c088
Makes suit sensor computer show the Northern Star instead of the Exodus.
2015-08-03 23:44:03 -04:00
Kelenius
9eacd42de8
Sleeper-related fixes
2015-07-29 13:21:29 +03:00
Kelenius
f948932bee
Updates sleepers
...
WIP
2015-07-29 11:17:15 +03:00
Neerti
045c7323a0
Begins work on removing the chemistry changed introduced from bay.
2015-07-26 22:01:35 -04:00
PsiOmegaDelta
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02:00
PsiOmegaDelta
9b0497e01e
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-24 10:46:32 +02:00
Kelenius
6b2daae752
Fixes #6264 - labeling janicart messes its ui
...
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
2015-07-20 16:27:58 +03:00
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
PsiOmega
5bca52796f
NanoUI template fixes.
2015-07-13 09:21:03 +02:00
PsiOmegaDelta
5b4dfdda9c
Allows one to define list of random selection items.
...
Includes a default list with a couple of semi-randomly selected probabilities.
2015-06-17 15:04:06 +02:00
PsiOmegaDelta
784f4d8705
Merge pull request #9792 from Techhead0/requestConsole
...
Request Console part two: NanoUI
2015-06-12 15:42:27 +02:00
Techhead0
b22afe6a59
Request Console NanoUI and fixes
...
Converts Request Console UI into NanoUI.
Fixes icon state not changing for normal priority messages.
Fixes consoles being partially operational while broken/unpowered.
Removes code for EXTREME priority messages.
2015-06-11 21:43:27 -04:00
PsiOmegaDelta
75cffd60aa
Merge pull request #9780 from Baystation12/dev-freeze
...
Dev
2015-06-10 11:15:45 +02:00
PsiOmega
399d810dba
Improves turret control NanoUI template.
...
Buttons are now disabled when the appropriate mode is selected, preventing them from turning blue on mouse hover.
2015-06-09 20:06:30 +02:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
3f26eeac99
Allows all synths to view the alternative law sets.
...
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
2015-06-02 14:48:08 +02:00
