cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-24 16:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,712 Commits 75 Branches 23 Tags
6ff99e2bd7ddbdfaa704dac1c2216f4050af3949
Commit Graph

13213 Commits

Author SHA1 Message Date
PsiOmegaDelta
8edf5cebc5 Merge pull request #11822 from Ccomp5950/fix_mining 
Makes the mining asteroid airless again.
 2015-12-30 10:31:41 +01:00
ccomp5950
ca55595f1b Makes the mining asteroid airless again. 
This turf surrounds the edges of the map.

air was "leaking" through it from off the map filling the zones that touch it with air.

fixes: #11365
 2015-12-30 00:13:12 -05:00
Chinsky
e512061d3c Merge pull request #10002 from atlantiscze/NTOSv2 
[READY FOR MERGE] Modular Computers
 2015-12-30 06:57:27 +03:00
Atlantis
a364dbf35d Implements emagging 
- Makes use of emag_act() to enable emagging of modular computers.
- Programs are now properly informed every tick to see whether the computer is emagged or not.
- As of now, the only program that acts differently is software downloader that allows downloads of malicious programs.
 2015-12-30 04:08:06 +01:00
Atlantis
9e1168ae9c Assorted bugfixes and tweaks + changelog 
- Adds codersprites for tablet programs that are currently required.
- Adds computer icons to some programs that missed them.
- Temporarily removes separate keyboard icon states for consoles. They may be reimplemented in the future in a bit better way.
- Rebalanced sizes of programs a bit
- File manager is no longer downloadable, as it is part of each hard drive's ROM.
- Fixed runtime error when vending a laptop
- Adjusted some code segments as per Techhead's suggestions on github
- Adds changelog.
 2015-12-30 03:18:56 +01:00
Kearel
d45da41095 Fixes #11661 
Basically the issue was that the obj in question was not an open
container.
Now it is.
 2015-12-29 15:12:07 -06:00
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
GinjaNinja32
b286d0c402 Merge pull request #11810 from PsiOmegaDelta/151229-PolarisDev 
Polaris Fixes
 2015-12-29 18:28:01 +00:00
Chinsky
163473a153 Merge pull request #11813 from PsiOmegaDelta/151229-ResomiBaseMob 
Can now spawn Resomi.
 2015-12-29 17:42:27 +03:00
Zuhayr
5fa5682e67 Merge pull request #11809 from GinjaNinja32/vv 
make VV list format clearer for assoc lists
 2015-12-30 00:05:44 +10:30
PsiOmegaDelta
a9e1bab519 Can now spawn Resomi. 
QoL addition, little more.
 2015-12-29 14:27:34 +01:00
Zuhayr
4da9f6df70 Merge pull request #11767 from Loganbacca/devfix 
Fixed player setup issues
 2015-12-29 23:47:31 +10:30
Zuhayr
b2a268ba0e Fixed weapon use by borgs. 2015-12-29 14:02:33 +01:00
GinjaNinja32
31c41f39b3 make VV list format clearer for assoc lists 2015-12-29 07:38:05 +00:00
GinjaNinja32
45d3d843f7 Merge pull request #11806 from Zuhayr/devfix 
Fixes.
 2015-12-29 07:06:31 +00:00
Zuhayr
f7109f8fa8 Cleaning up some holder/scoop/climbing code. 2015-12-29 16:10:27 +10:30
GinjaNinja32
5296f7458a Merge pull request #11798 from Ccomp5950/sleepy_emotes 
Involuntary emotes no longer check if you are conscious.
 2015-12-29 04:56:34 +00:00
GinjaNinja32
60a6fe9513 Merge pull request #11799 from Ccomp5950/merge_fix 
Fix previous merge conflict oopsie.
 2015-12-29 04:55:49 +00:00
Loganbacca
b94fa98170 Tweaked a couple of fixes 2015-12-29 16:41:59 +13:00
ccomp5950
dd2db22e64 Fix previous merge conflict oopsie. 
1b10f78940
 2015-12-28 19:31:14 -05:00
ccomp5950
cf0320ee14 Involuntary emotes no longer check if you are conscious. 
Fixes: #11791

Unconcious folks don't scream.
 2015-12-28 18:40:44 -05:00
PsiOmegaDelta
66112636c8 Human blindness status should now be reset to 0 before any updates, preventing them from being left permanently blind. 
Fixes #11771.
 2015-12-28 22:38:58 +01:00
PsiOmegaDelta
91dbf027d0 Synths can now speak EAL. 2015-12-28 20:53:31 +01:00
PsiOmegaDelta
14381dfd87 Makes the AI/Malf status entries consistent with the rest of the mob stat entries. 2015-12-28 20:50:07 +01:00
PsiOmegaDelta
82a51505cf The binary channel will now be listed using the user's primary language key, instead of : 2015-12-28 20:37:05 +01:00
PsiOmegaDelta
4d83861b85 Synths can now understand the language of the resomi. 
Fixes #11778.
 2015-12-28 20:15:17 +01:00
Loganbacca
4b1f87ae12 Fixed dionae preview icon issues 2015-12-28 22:05:51 +13:00
Loganbacca
358a85a179 Preview icon fixes 
- Fixes preview icon not updating with skin/hair/eye colour, and underwear selection
 - Fixes bug causing blank underwear and undershirt selection after randomizing
 2015-12-28 21:25:14 +13:00
Loganbacca
c0fb63c796 Fixed player setup runtimes 
- Language update_setup runtime for new players with no save file
 - pAI content runtime for new players with no save file
 2015-12-28 16:21:49 +13:00
PsiOmegaDelta
00b556e768 Merge pull request #11762 from Baystation12/dev-freeze 
Dev
 2015-12-27 16:10:04 +01:00
mwerezak
8b685fdf8f Fixes #11380 2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea Fixes #11381 2015-12-27 01:28:41 -05:00
PsiOmegaDelta
da0a4c47cf Merge pull request #11756 from Baystation12/master 
Dev-freeze
 2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow 
Can now join compatible cable coils of any type.
 2015-12-26 18:23:43 +10:30
PsiOmegaDelta
faec92b553 Can now join compatible cable coils of any type. 
Partial backport of #11656. Fixes #10935.
 2015-12-25 11:19:59 +01:00
GinjaNinja32
2d5b677a62 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-12-25 03:51:40 +00:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
GinjaNinja32
04006f5b9e fix human examine gender 2015-12-25 01:06:35 +00:00
Zuhayr
53b2c6be80 Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis 
Adds a paralyze button for easier administration
 2015-12-23 23:28:37 +10:30
PsiOmegaDelta
1e86e42359 Removes jar slime handling, whatever it was supposed to be. Fixes #11689. 2015-12-23 13:46:31 +01:00
PsiOmegaDelta
70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
Datraen
65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:57:43 +01:00
Datraen
c5912b988c Adds a paralyze button for easy administration. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:56:48 +01:00
PsiOmegaDelta
7123044b3e Merge pull request #11736 from Baystation12/dev-freeze 
Dev
 2015-12-23 11:38:51 +01:00
PsiOmegaDelta
f54dd94a66 Merge pull request #11735 from Baystation12/master 
Dev-freeze
 2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647 Fixes AI's Examine() 
- Message about AI's backup power now only show when the AI still lacks external power.
 2015-12-23 00:57:54 +01:00
Zuhayr
b6984d9a20 Added checks for character age to numerous jobs. 
Conflicts:
	code/game/jobs/job/assistant.dm
 2015-12-22 13:24:12 +01:00
PsiOmegaDelta
a95927d653 Merge pull request #11728 from Baystation12/dev-freeze 
Dev
 2015-12-22 12:08:45 +01:00
PsiOmegaDelta
3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-12-22 10:46:55 +01:00
Ccomp5950
9383dfb199 Merge pull request #11719 from Spamcat/devbugs 
Couple of dev fixes
 2015-12-21 15:51:50 -05:00