cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,894 Commits 74 Branches 23 Tags
ec805ef9f5af91f3d7a9fe2e9153274f428a96e9
Commit Graph

21733 Commits

Author SHA1 Message Date
Techhead0
ec805ef9f5 Adds the "Shipping Error" random event. 
Adds a new random event that puts a free random crate on the next supply shuttle.
 2016-01-10 04:21:29 -05:00
Chinsky
6cc4c26560 Merge pull request #11944 from PsiOmegaDelta/160108-PolDev 
Various fixes.
 2016-01-09 23:39:17 +03:00
Chinsky
4c81f55d36 Merge pull request #11947 from atlantiscze/2016-01-09-PowerMonitorAlarm 
Power monitor tweaks
 2016-01-09 23:39:13 +03:00
Ccomp5950
6eaaacf58f Merge pull request #11945 from PsiOmegaDelta/160108-GhostlyAccess 
Admin observers now have an all access id.
 2016-01-09 02:40:18 -05:00
Atlantis
71a10aa218 Fixes tablets from custom loadout starting without processor installed. 2016-01-09 07:00:40 +01:00
Atlantis
9f4b5c6920 Power monitor tweaks 
- Power monitor now has modular computer header icon.
- Power monitor now updates the computer's texture depending on whether there is a power network alert or not, as it used to do in the past.
 2016-01-09 06:28:32 +01:00
PsiOmegaDelta
ce1b138387 Admin observers now have an all access id. 
Gives them further control over modular computers.
 2016-01-08 23:26:30 +01:00
GinjaNinja32
f7ec85e0f0 Merge pull request #11933 from comma/mirrormirror 
Handheld mirror
 2016-01-08 22:09:22 +00:00
Datraen
8eaf6804e6 Fixes #685. 2016-01-08 18:13:47 +01:00
PsiOmegaDelta
5524739e70 Tweaks the datum pooling. 2016-01-08 16:03:54 +01:00
PsiOmegaDelta
6061556f1c Fixes the PP shortcut in the Check Antag panel. 2016-01-08 15:40:36 +01:00
PsiOmegaDelta
2c1debbcaa Logging tweaks. 
Uploading a new library book now also gives an admin notice.
Admin logs will now add a (JMP) if at all applicable.
 2016-01-08 15:22:43 +01:00
PsiOmegaDelta
afd526126d Fire extinguisher fixes and tweaks 
Port of https://github.com/PolarisSS13/Polaris/pull/713.
 2016-01-08 14:47:18 +01:00
PsiOmegaDelta
875d8455f0 Pooling Update from TG 
Ports https://github.com/tgstation/-tg-station/pull/13279.
 2016-01-08 14:47:13 +01:00
Hubblenaut
a89c066905 Fixes onmob icons for holders 
Conflicts:
	code/game/objects/items.dm
 2016-01-08 14:47:08 +01:00
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
Chinsky
c3b3f6e546 Adds Destroy to both handheld and wall mirrors 2016-01-08 02:07:29 +03: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
Chinsky
6f2450c3d5 Unrelatedly cleans up some dark ages-styled code. 2016-01-07 21:18:29 +03:00
Chinsky
8471813406 Adds a handheld mirror that can change hairstyles. 2016-01-07 21:17:31 +03: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