cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,851 Commits 74 Branches 23 Tags
97c0635fad74b533b908d865666b4ed2f7835ac8
Commit Graph

21697 Commits

Author SHA1 Message Date
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
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
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
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
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
ccomp5950
7e100bb844 Adding mob damage tests. -- This will fail in travis -- 
Species damage modifications haven't been completed in here.  And IPC's are dumb.
 2016-01-03 02:49:58 -05:00
PsiOmegaDelta
a2a5e367f6 Adds a chilled N2 canister to Research Server room. 
With minor cleanup included. Fixes #11790.
 2016-01-02 19:15:59 +01:00
ccomp5950
eab39185e2 Change to _template. 2016-01-02 01:45:40 -05:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis 
Qdel() tweaking and a bonus
 2016-01-01 23:58:29 -05:00
ccomp5950
47af67b72f Terminal Colors Green and Red for success states. 2016-01-01 20:33:01 -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
Mustafa Kalash
9a2245fe65 Fixes #11864 2016-01-01 15:05:22 -05:00
Chinsky
03a4ef022e Merge pull request #11849 from PsiOmegaDelta/151231-Atmotop 
Fixes atmospherics laptops proper.
 2016-01-01 21:11:45 +03: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