Commit Graph

13294 Commits

Author SHA1 Message Date
PsiOmegaDelta
afd526126d Fire extinguisher fixes and tweaks
Port of https://github.com/PolarisSS13/Polaris/pull/713.
2016-01-08 14:47:18 +01:00
Hubblenaut
a89c066905 Fixes onmob icons for holders
Conflicts:
	code/game/objects/items.dm
2016-01-08 14:47:08 +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
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
7b4289e072 Macro for intent 2016-01-07 19:40:50 +03: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
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
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
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
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
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
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
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
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
PsiOmegaDelta
b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating.
Fixes #11852.
2016-01-03 12:49:27 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta
ebdd394e4f Merge pull request #11868 from hockeygoalie5/fixes
Fixes
2016-01-01 23:29:45 +01:00
Chinsky
e947862886 Merge pull request #11851 from atlantiscze/31-12-2015-consolepresets
Modular Consoles, Tweaks
2016-01-02 01:25:50 +03:00
Mustafa Kalash
7d67efa381 Finishes 6e23584. 2016-01-01 17:17:33 -05:00
Mustafa Kalash
de6779c6a8 Continuation of 6e23584. 2016-01-01 16:32:59 -05:00
Mustafa Kalash
73436d6cfd Fixes another problem with be75349. Should be for real this time. 2016-01-01 16:31:04 -05:00
Mustafa Kalash
6e23584e69 Fixes #11776. Fixes error in be75349. 2016-01-01 16:20:02 -05:00
Mustafa Kalash
82e793ae91 Fixes #11783 2016-01-01 15:52:35 -05:00
Mustafa Kalash
be753497d0 Fixes #11801. 2016-01-01 15:35:17 -05:00
Chinsky
290cae2b51 Merge pull request #11854 from Loganbacca/devfix
Small fixes
2016-01-01 21:11:04 +03:00
PsiOmegaDelta
253a4bc3d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2016-01-01 13:15:51 +01:00
PsiOmegaDelta
4ed1e118fc Merge pull request #11861 from Baystation12/master
Dev-freeze
2016-01-01 13:14:21 +01:00
PsiOmegaDelta
0f44645a75 Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing
Removes oxygen_agent_b and volatile_fuel gases
2016-01-01 12:18:18 +01:00
PsiOmegaDelta
e6923872e9 Merge pull request #11857 from atlantiscze/01-01-2016-CartridgesFix
Fixes chemical cartridge splashing
2016-01-01 12:18:01 +01:00
Atlantis
9d1e6e017c Fixes chemical cartridge splashing
- Fixes #11853
- Attempting to transfer reagents into the cartridge when it is closed will no longer splash the reagents.
2016-01-01 01:43:53 +01:00
Kearel
2a44128b78 Modifications to actor verb, orion trail, and board game.
Orion Trail only works when power is on now.
'Join as Actor' verb will now prompt you to make sure.
Boardgame can now be picked up by those viewing it (makes it easier to
view)
2015-12-31 17:54:25 -06:00
Atlantis
0d10e4b1ef Removes oxygen_agent_b and volatile_fuel gases
- oxygen_agent_b wasn't used at all, except for filters which, for some reason filtered it in addition to phoron
- volatile_fuel was only used in two chemistry reactions as reaction result, it was replaced with gaseous phoron.
2016-01-01 00:34:59 +01:00