Commit Graph

21715 Commits

Author SHA1 Message Date
Datraen
18d0c782fb Adds extended info to certain game modes missing extended info.
Conflicts:
	code/game/gamemodes/heist/heist.dm
2016-01-08 14:47:03 +01:00
Dibasic
e9dac928b0 Cold air shiver typo fix 2016-01-08 14:46:58 +01:00
PsiOmegaDelta
f9b61ed1ec Merge pull request #11943 from Baystation12/dev-freeze
Dev
2016-01-08 14:27:32 +01:00
PsiOmegaDelta
cf463ffd48 Merge pull request #11942 from Baystation12/master
Dev-freeze
2016-01-08 13:59:21 +01:00
PsiOmegaDelta
8ea8c342bc Merge pull request #11940 from comma/pixelhunt
Makes inventory slots forward clicks to items in them
2016-01-08 13:37:47 +01:00
PsiOmegaDelta
596bcdf55f Merge pull request #11938 from atlantiscze/2016-01-07-MultiThreading
Modular Computer Multitasking + Fixes
2016-01-08 13:37:25 +01:00
GinjaNinja32
8e21267ec2 Merge pull request #11941 from Ccomp5950/SANIC
Unit Tests:  Disables asteroid generation.
2016-01-08 09:40:29 +00:00
ccomp5950
5e1629768d Unit Tests: Disables asteroid generation.
Speeds the startup by 60 seconds.

Unable to test the asteroid for a vacuum though.
2016-01-08 01:27:47 -05:00
Chinsky
f569d55527 Merge pull request #11911 from Kearel/modificationsAndFixes
Modifications to actor verb, orion trail, and board game.
2016-01-08 09:21:03 +03:00
Chinsky
4de4cac9be Makes inventory slots forward clicks to items in them. In effect that means you don't have to pixelhunt item in the slot, just click the slot. Smoking cigs is easy mode now. 2016-01-08 09:08:44 +03:00
Atlantis
409a832646 Fixes #11931 + Design bug
- NTNRC conversations are now rather matched by Unique ID that's assigned on New(), rather than name. This has a nice side effect of being able to have conversations that share names.
- Tweaks design datums a bit. Renames "processor unit" to "computer processor unit", etc. since i noticed telecomms machine already uses "processor unit" name. Also corrects duplicated ID.
2016-01-08 01:55:56 +01:00
Atlantis
265c0d2567 Modular Computer Multitasking + Fixes
- Modular computers now support multitasking.
- New hardware type added. Basic CPUs may be obtained when purchasing a laptop or tablet, Photonic CPUs can be printed at research at imprinter. This hardware piece determines how many programs can be on background.
- Programs can now have an icon that is rendered in main UI's header (along with the power icons, etc.) when the program is on background. As an example, these icons have been added to NTNRC client (Dark icon when no messages have been received, blinking when new message is waiting), Alarm monitor (Blinking red when an alarm is active, green otherwise) and downloader program (Animated arrow when downloading, stationary when finished.)
- Adds missing crew monitor icon to tablets. Fixes #11937
2016-01-08 01:34:30 +01:00
Techhead0
77ecaac36b Quick fix for #11772
Changes character setup to use species' bodytypes to determine hairstyle availability.
2016-01-07 17:01:25 -05:00
Ccomp5950
97c0635fad Merge pull request #11927 from comma/devfix
Devfixes
2016-01-07 13:03:26 -05:00
Chinsky
2f67cb18d8 Merge pull request #11898 from Hubblenaut/dev
Diverse Police Tape fixes/tweaks
2016-01-07 20:50:32 +03:00
GinjaNinja32
fc586c5868 Merge pull request #11929 from atlantiscze/2016-01-07-Mapfixes
Map fixes - Dev Edition
2016-01-07 17:10:45 +00:00
Chinsky
7b4289e072 Macro for intent 2016-01-07 19:40:50 +03:00
PsiOmegaDelta
fcc8389203 Floor construction now checks stack subtypes.
Fixes #11930.
Also makes the robot fabricator use proper paths because I found it while searching for build type.
2016-01-07 17:14:09 +01:00
Hubblenaut
cd0a1221d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-07 14:37:18 +01:00
Atlantis
cbcd5ab035 Map fixes - Dev Edition
- See #11658 - this is just edition for Dev
- TLDR version: Fixes power alarm at construction site, fixes emitter button giving errors about not being connected to cable, unanchors emitters at mining outpost by default.
- Added subtype for inactive APCs as per PsiOmegaDelta's request
- Fixed gridcheck affecting telecommunications central compartment.
2016-01-07 12:34:38 +01:00
PsiOmegaDelta
14f373983f Also makes the economic species modifier more general. 2016-01-07 12:23:04 +01:00
PsiOmegaDelta
1b564bb179 Map and icon tweaks.
Re-adds medical examination wall and chapel mass driver button.
Ensures that the chapel crematorium button does not lose its default icon on icon update.
Fixes #11915. Fixes #11894.
2016-01-07 11:56:06 +01:00
Chinsky
f7b0f2796e Merge pull request #10095 from RavingManiac/dev-2
Capacity-based storage system
2016-01-07 07:17:10 +03:00
Chinsky
0d7c52b869 Fixes #11884 2016-01-07 07:07:45 +03:00
Chinsky
f0678854ec Fixed monkey scooping. Again. 2016-01-07 07:06:20 +03:00
Chinsky
bc390c5603 Fixes #11914 2016-01-07 05:49:16 +03:00
Chinsky
e9991c99ae Fixes #11916 2016-01-07 05:47:51 +03:00
Chinsky
7af61b9a6b Fixes #11924 2016-01-07 05:43:40 +03:00
Kearel
6ec929c14d should realistically fix merge conflicts
I don't know actually if it will.
2016-01-06 15:12:05 -06:00
PsiOmegaDelta
a4d9220bfa Converts unit testing checks into #ifdef and #ifndef.
As per Mloc's comment in #11917.
2016-01-06 22:09:33 +01:00
Kearel
9134827dd6 Can now set things directly onto the board
There are now checks in place for adjacency and consciousness so
unconscious/dead people can't play checkers.
2016-01-06 15:04:04 -06:00
PsiOmegaDelta
4f2a984b09 DME fixes.
DreamMaker automatically cleaned up the dme.
Made it possible to compile on Windows again.
2016-01-06 22:00:14 +01:00
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check.
Fixes #11900.
2016-01-06 18:31:39 +01:00
PsiOmegaDelta
940a7ef7a3 Merge pull request #11897 from atlantiscze/2016-01-05-computer_fixes
Ghosts may now interact with modular computers
2016-01-06 17:24:53 +01:00
Nicolai Czempin
f040b221b0 Cleanbot cleans closest dirt first 2016-01-06 14:51:01 +01:00
Chinsky
d2940ce1f6 Merge pull request #11808 from Ccomp5950/unit_tests
Unit Tests Framework
2016-01-06 07:38:50 +03:00
Chinsky
97adc1d9ff Merge pull request #11892 from PsiOmegaDelta/160104-Economics
Species economy modifier now defaults to human if missing.
2016-01-06 01:49:21 +03:00
Hubblenaut
e1f58161ac Diverse Police Tape fixes/tweaks 2016-01-05 19:14:18 +01:00
Atlantis
111fe2e54b Ghosts may now interact with modular computers
- Ghosts can interact with modular computers by clicking them now. This carries normal restrictions as other NanoUIs operated by ghosts - they may not click any buttons, etc.
- Admin-ghosts can now fully use modular computers when ghosted. When the computer is turned off, they get a prompt on click whether they want to admin-enable it or not.
- Fixes #11874
2016-01-05 17:30:29 +01:00
RavingManiac
a8cea3862d Backpack and box storage capacity set to 16 and 8 respectively. Maximum w-class set to 4 and 3 respectively.
Storage box sprite made lighter to improve visibility against dark backgrounds.
2016-01-05 22:26:15 +08:00
PsiOmegaDelta
a04c0019ef Space helmets now block hair.
Fixes #11895.
2016-01-05 12:19:26 +01:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
PsiOmegaDelta
b08533b500 Species economy modifier now defaults to human if missing.
Fixes  #11891.
2016-01-04 09:38:31 +01:00
GinjaNinja32
e5b7fc5bbb Merge pull request #11888 from PsiOmegaDelta/160103-Blood
IV negativity fix.
2016-01-04 01:58:33 +00:00
PsiOmegaDelta
6aea83aeb3 Replaces mega-health windows.
Mega health windows (the old 1e007 Crescent windows) are now replaced with with either normal reinforced windows or the Crescent window sub-type or relevant window spawners.
Also changes the security sub-armory window from dir 5 to 2 (non-cardinal directions transforms windows into full-tile ones, it's no longer visible in the mapper). Fixes  #11889.
Adds pre-defined full tile reinforced windows for when those are needed.
2016-01-03 20:57:34 +01:00
PsiOmegaDelta
9984d72ff6 It should now be possible to give species with blood IV, rather than species without blood. 2016-01-03 17:31:49 +01:00
GinjaNinja32
c1762c6b22 Merge pull request #11886 from PsiOmegaDelta/160103-TheMap
More fixes.
2016-01-03 12:59:02 +00:00
ccomp5950
16ca56e197 Fixes #11885 2016-01-03 07:09:59 -05:00
ccomp5950
dbe1f155c7 Finalized mob damage procs.
I'm done.
2016-01-03 06:54:47 -05:00
PsiOmegaDelta
b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating.
Fixes #11852.
2016-01-03 12:49:27 +01:00