cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,008 Commits 74 Branches 23 Tags
05dd328f3aa0af298ede95d1bac373f83d8865e2
Commit Graph

21828 Commits

Author SHA1 Message Date
ccomp5950
05dd328f3a Fixes #9399 2016-01-18 21:30:33 -05:00
GinjaNinja32
03ae29fb95 Merge pull request #11992 from Ccomp5950/malf_fixes 
Malf fixes
 2016-01-18 06:47:24 +00:00
ccomp5950
64931a3fa5 Uses "Disabled_Jobs" instead to block the empty ai_core. 2016-01-17 20:22:57 -05:00
PsiOmegaDelta
aeb8cda7e7 Merge pull request #12000 from atlantiscze/2016-01-17-StorageBuff 
Buffs backpack capacities
 2016-01-17 19:26:04 +01:00
Hubblenaut
0aa4f10013 Center_of_mass for snacks/dishes 2016-01-17 16:12:02 +01:00
Dibasic
729d5b2881 antique laser description typo fix 
there wasn't a period this adds a period
 2016-01-17 12:20:44 +01:00
Zuhayr
6b6425d4fd Actually fixes https://github.com/PolarisSS13/Polaris/issues/673. 
Conflicts:
	code/game/antagonist/station/changeling.dm
 2016-01-17 12:20:03 +01:00
Atlantis
b18389e39d Buffs backpack capacities 
- From 4 normal items to 7 normal items
 2016-01-17 08:57:21 +01:00
Chinsky
3429a575d4 Merge pull request #11989 from Ccomp5950/fix_looc 
Changes LOOC to loop through player_list instead of recursing.
 2016-01-17 03:46:30 +03:00
Chinsky
f645de8713 Merge pull request #11999 from Techhead0/DevFixes 
Dev fixes: Sheets, Belts, Hair
 2016-01-17 03:45:38 +03:00
Techhead0
62540b5b8c Fixes #11833 
If you were holding the sheet, they would spawn inside the mob, irretrievable.
 2016-01-16 14:27:07 -05:00
Techhead0
8ef7336a2c Fixes #11990 2016-01-16 13:32:36 -05:00
Techhead0
bd9ae18d63 Fixes #11991 2016-01-16 13:23:42 -05:00
GinjaNinja32
45b11d27b9 Merge pull request #11993 from Ccomp5950/robutt_module_icons 
Adds module images for remaining robot modules.
 2016-01-16 09:37:05 +00:00
ccomp5950
3fce8848d8 Adds unit test to check for icon states for robutt modules. 
Why?  For the glory of Nar'Sie of course!
 2016-01-16 01:03:41 -05:00
ccomp5950
58b9740df6 Fixes runtime I noticed during Malf. 
Something spawns out on random space tiles during round start, might be malf but eh.

runtime error: Cannot execute null.HasProximity().
proc name: Entered (/turf/Entered)
  source file: turf.dm,147
  usr: null
  src: space (246,55,4) (/turf/space)
  call stack:
space (246,55,4) (/turf/space): Entered(null)
 2016-01-15 21:22:36 -05:00
ccomp5950
6071eb3b63 Doesn't spawn inactive AI on malf. 2016-01-15 21:19:53 -05:00
Ccomp5950
515c2e5405 Merge pull request #11977 from atlantiscze/2016-01-12-SMESBalancing 
SMES Load Balancing
 2016-01-15 19:41:52 -05:00
ccomp5950
b5f4765af0 Changes LOOC to loop through player_list instead of recursing. 
Tested by putting a PAI in a backpack on a mob inside of a locker.
Tested by using LOOC as an AI and hearing from a regular human / vice versa.
 2016-01-15 18:11:04 -05:00
Ccomp5950
228454c7d0 Merge pull request #11965 from PsiOmegaDelta/160111-Tele 
Makes it possible to convert uplink TCs into physical form.
 2016-01-15 02:08:07 -05:00
Atlantis
c40a8eecfb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 2016-01-12-SMESBalancing 2016-01-15 07:53:06 +01:00
Atlantis
5a09ad45a0 Tweaks 
- Implements github suggestions
- Fixes one SMES that had incorrect settings from previous change.
 2016-01-15 07:52:33 +01:00
Ccomp5950
92ba35fadd Merge pull request #11985 from GinjaNinja32/wingrille 
fix wingrille spawners allowing initial ZAS init to expand zones through them
 2016-01-15 00:33:45 -05:00
Ccomp5950
d726941d5c Merge pull request #11981 from PsiOmegaDelta/160114-PolarisDev 
Tweaks and fixes MKII
 2016-01-15 00:33:36 -05:00
GinjaNinja32
06dd8010f3 fix wingrille spawners allowing initial ZAS init to expand zones through them 2016-01-15 00:16:22 +00:00
GinjaNinja32
0b1e0eb557 Merge pull request #11982 from Ccomp5950/wire_unit_test 
Unit tests:  Adds check for multiple cables on top of each other.
 2016-01-14 08:58:00 +00:00
Ccomp5950
d34e30a915 Merge pull request #11975 from PsiOmegaDelta/160112-PublicToggle 
Adds verb to toggle hub visibility.
 2016-01-14 03:21:41 -05:00
GinjaNinja32
32ee8d7ee8 Merge pull request #11979 from PsiOmegaDelta/160113-Changelog 
Tweaks and changelog.
 2016-01-14 08:19:19 +00:00
ccomp5950
a647194565 Unit tests: Adds check for multiple cables on top of each other. 
...that are going the same direction
 2016-01-14 03:07:18 -05:00
Zuhayr
eec1c9a32a Applying Harpy's prosthetic limb damage fix. 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2016-01-14 08:54:56 +01:00
Jon
6e931d0125 Fixes mask coverage. 2016-01-14 08:44:43 +01:00
Zuhayr
4b356f5a36 Robotic limbs and non-DNA mobs will now respect gendered icons. 
Conflicts:
	code/modules/organs/organ_icon.dm
 2016-01-14 08:44:21 +01:00
PsiOmegaDelta
e745093acc Corrects snack macros. 2016-01-14 08:42:24 +01:00
Zuhayr
cc4c86c995 Fixes #270 2016-01-14 08:37:10 +01:00
Zuhayr
d9a27133bd Fixes #260 2016-01-14 08:36:42 +01:00
Zuhayr
8da41d6bca Fixes #676 2016-01-14 08:36:06 +01:00
PsiOmegaDelta
899b2effd4 Adds \the macros. 2016-01-14 08:35:31 +01:00
Zuhayr
253f2a278e Fixes #728 2016-01-14 08:34:16 +01:00
Zuhayr
ba6d684e96 Adds [dock_name] entry used by shuttles. 
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	code/global.dm
	code/modules/shuttles/shuttle_emergency.dm
 2016-01-14 08:33:22 +01:00
ccomp5950
d316e34b61 Fixes deadmin popup. 
You can too re-admin yourself...I wrote that shit.
 2016-01-13 23:00:47 -05:00
PsiOmegaDelta
5a4a240e43 Merge remote-tracking branch 'upstream/dev' into 160111-Tele 
Conflicts:
	baystation12.dme
 2016-01-13 12:10:57 +01:00
PsiOmegaDelta
95d73b8b71 Makes the floor wetness proc use the scheduler instead of sleeping. 2016-01-13 10:37:31 +01:00
PsiOmegaDelta
8b60de9c65 Merge remote-tracking branch 'upstream/dev' into 160112-PublicToggle 
Conflicts:
	baystation12.dme
 2016-01-13 10:14:51 +01:00
PsiOmegaDelta
2d978abfef Adds a space. 2016-01-13 09:08:28 +01:00
PsiOmegaDelta
ffe31d0414 Replaces an incapacitated(flag) check with the appropriate method instead. 2016-01-13 08:25:00 +01:00
Chinsky
e98e8be271 Merge pull request #11978 from atlantiscze/2016-01-12-TeslaFix 
Modular computer fixes
 2016-01-13 10:24:20 +03:00
Chinsky
2bc991a199 Merge pull request #11968 from Ccomp5950/area_tests 
Mapping Tests / APC's / Scrubbers / Vents
 2016-01-13 10:23:55 +03:00
PsiOmegaDelta
4f6ebf9a43 Adds a config option to automatically delist the server from the BYOND up when there are no admins. 2016-01-13 08:05:49 +01:00
Atlantis
75e40d7748 Modular computer fixes 
- Tesla link is now correctly enabled when being installed into a console. Fixes #11974
- Tesla link now correctly stops using power when the computer shuts down.
- Configurator program now uses much better method to obtain list of components. This method takes into account possible hardware additions in the future.
 2016-01-12 23:57:36 +01:00
Atlantis
ad30a3a19e SMESs no longer output by default 
- Exception to this are SMESs that are intended to output - engine room, AI core, atmospherics, telecommunications, all asteroid outposts. This is why map changes had to be made.
 2016-01-12 21:50:17 +01:00