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
26,566 Commits 74 Branches 23 Tags
c664ca6096f39b4cbf79775f64e5baead6b8fcf5
Commit Graph

20008 Commits

Author SHA1 Message Date
Chinsky
c664ca6096 Merge pull request #10276 from mwerezak/uplink-items 
Allows traitors the option of purchasing the C-20r or STS-35
 2015-08-14 03:55:03 +03:00
Chinsky
c5d54ba454 Merge pull request #10455 from mwerezak/t-scanner 
Adds client image based t-scanner
 2015-08-14 01:39:36 +03:00
Chinsky
cce6c3ce2d Merge pull request #10026 from Zuhayr/dronehats 
Added hats for drones.
 2015-08-13 17:49:03 +03:00
Chinsky
3b500d4076 Merge pull request #10279 from Kearel/LibraryModifications 
Library modifications
 2015-08-13 17:47:16 +03:00
Zuhayr
cc340831e2 Merge pull request #10304 from GinjaNinja32/follow 
Better follow code
 2015-08-13 18:39:20 +09:30
Zuhayr
4674333143 Minor holder refactor. 2015-08-13 17:31:42 +09:30
Zuhayr
ab49ac0d6d Adds hats to dionaea. 2015-08-13 17:31:41 +09:30
Zuhayr
2f6a1f2830 Added hats for drones. 2015-08-13 17:31:40 +09:30
PsiOmegaDelta
efef67a3e4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-13 09:11:05 +02:00
PsiOmegaDelta
1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-08-13 09:01:10 +02:00
Kearel
93959dc83d Changelog + scrambled paper 2015-08-13 01:16:00 -05:00
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
GinjaNinja32
f52d48c91f Merge remote-tracking branch 'upstream/dev' into follow 
Conflicts:
	.travis.yml
 2015-08-13 05:54:30 +01:00
Chinsky
ac80136603 Merge pull request #10184 from mwerezak/projectile-cleanup 
Projectile code cleanup
 2015-08-13 07:26:58 +03:00
Chinsky
6781e05bd6 Merge pull request #10086 from mwerezak/arrows 
Adds the ability to draw arrows with crayon
 2015-08-13 07:24:03 +03:00
Chinsky
f7ccf47f06 Merge pull request #10030 from GinjaNinja32/languages 
Reworks character creation language selection
 2015-08-13 07:23:44 +03:00
Chinsky
89659c99fc Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor 
Refactors mask voice changes.
 2015-08-13 07:23:27 +03:00
Chinsky
3fd8627bd7 Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup 
Refactors gas analyzation.
 2015-08-13 07:23:10 +03:00
Chinsky
81932abb29 Merge pull request #9995 from PsiOmegaDelta/150630-AddingThatMissing24GHour0ItIsDrivingMeInsaneAlright 
Time padding.
 2015-08-13 07:23:05 +03:00
Chinsky
2b965d7cd7 Merge pull request #9907 from Zuhayr/windowspawner 
Ported window spawner, tyvm WrongEnd
 2015-08-13 07:22:58 +03:00
Chinsky
fc14ec9fca Merge pull request #9883 from mwerezak/ert-lights 
Adds more coloured lights
 2015-08-13 07:22:45 +03:00
Chinsky
21f7c8234d Merge pull request #10473 from mwerezak/firemode-cleanup 
Streamlines gun fire modes
 2015-08-13 07:22:28 +03:00
GinjaNinja32
98c2a0c8b1 Merge pull request #10594 from mwerezak/embed-fix 
Embedding and broken limb fixes
 2015-08-13 04:52:20 +01:00
mwerezak
1dc853710c Implant items do not count for continuing to process embedded objects 
Also makes embedded pain messages respect NO_PAIN.
 2015-08-12 23:38:44 -04:00
mwerezak
99e1d88285 Fixes #10592 
Fixes the right hand being affected if the left arm was broken.
 2015-08-12 22:41:30 -04:00
mwerezak
62ad3a7be4 Fixes #10593 
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
 2015-08-12 22:24:14 -04:00
Chinsky
6d4699fa32 Merge pull request #10590 from GinjaNinja32/debug 
more debug stuff
 2015-08-13 05:22:45 +03:00
GinjaNinja32
8d57f25fd5 Add a runtime-generating call to the "object was deleted via del() rather than qdel()" log, so we can get a stack trace from it 2015-08-13 01:51:40 +01:00
GinjaNinja32
83b26cf43a Revert "Debug code to try to figure out the cause of the player-panel etc breaking" 
This reverts commit 9dacc146cd.
 2015-08-13 01:45:41 +01:00
Atlantis
f41387a57f Communications emergency-fix 
- Comments out buggy code that caused some telecommunication machines to introduce insane delay (up to 30s)
 2015-08-13 00:07:32 +02:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc 
Fixes
 2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63 Fixes #10552 2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658 Fixes #10571 
Adds another snowflake electronic item to the can_hold list.
 2015-08-12 16:06:31 -04:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list 
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
 2015-08-12 15:54:16 -04:00
HarpyEagle
3e6889927e Fixes #10500 2015-08-12 15:26:57 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name 
Gives the hydro soil recipe a name that better conveys it's purpose.
 2015-08-12 15:25:01 -04:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master 
Couple of fixes.
 2015-08-12 15:00:36 -04:00
Zuhayr
5f17cf4397 Merge pull request #10568 from SparklySheep/patch-14 
Fixes #10532
 2015-08-13 04:18:23 +09:30
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30
Zuhayr
9831aede3f Fixes drone pulling. 2015-08-13 03:31:57 +09:30
PsiOmegaDelta
94e3fe6f5f Merge pull request #10567 from mwerezak/fire-cooling-fix 
Fixes carbon fire_act()
 2015-08-12 19:54:42 +02:00
Chinsky
8c8c2bce85 Merge pull request #10503 from PsiOmegaDelta/150811-BorgSpawnRuntime 
Fixes a borg spawn runtime.
 2015-08-12 20:42:04 +03:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew 
Fixes the One Crew Member module.
 2015-08-12 20:38:52 +03:00
Chinsky
069de7dcb6 Merge pull request #10560 from PsiOmegaDelta/150812-CorrectTypeCheck 
Prevents APC wires from being displayed to the AI.
 2015-08-12 20:38:34 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes 
Runtime fixes.
 2015-08-12 20:38:20 +03:00
SparklySheep
27296e7caf Update preferences_gear.dm 2015-08-12 12:13:28 -05:00
SparklySheep
cefd32fa69 Update glasses.dm 2015-08-12 12:09:00 -05:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
HarpyEagle
9609ce0b0d Fixes #10546 2015-08-12 12:06:31 -04:00