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

6436 Commits

Author SHA1 Message Date
PsiOmegaDelta
96cbc225ff Bags with the auto-pickup ability can no longer grab anchored objects. 
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
 2015-12-30 11:28:54 +01:00
Chinsky
163473a153 Merge pull request #11813 from PsiOmegaDelta/151229-ResomiBaseMob 
Can now spawn Resomi.
 2015-12-29 17:42:27 +03:00
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
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
PsiOmegaDelta
00b556e768 Merge pull request #11762 from Baystation12/dev-freeze 
Dev
 2015-12-27 16:10:04 +01:00
mwerezak
b30f81c7ea Fixes #11381 2015-12-27 01:28:41 -05: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
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
5873a92df8 Fixes the icon for numbness. 
Resolves #11435
 2015-12-21 15:30:26 -05:00
PsiOmegaDelta
4eb5ff1b87 Buckling and disability check tweaks. 
Buckling now returns fully buckled if you're restrained, otherwise partially buckled.
Wraps incapacitated(INCAPACITATION_DISABLED) in a proc call to ensure there's is only one place to alter in the future.
 2015-12-20 12:03:29 +01:00
PsiOmegaDelta
f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-12-20 11:55:53 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
PsiOmegaDelta
378f62b81e AI qdel() improvements. 
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
 2015-12-19 11:45:24 +01:00
Zuhayr
740d10d3fc Fixes colour issues. 2015-12-18 07:58:54 +01:00
Hubblenaut
dce5a70572 Colors on-mob sprites 2015-12-17 17:54:44 +01:00
Hubblenaut
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep. 
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
 2015-12-16 13:24:40 +01:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
 2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
Chinsky
911498fc32 Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1 
fix slime core injecting not working
 2015-12-13 11:05:16 +03:00
Joseph Heinemeyer
a5b0f86c19 s/"help"/I_HELP/g 2015-12-12 15:24:13 -07:00
GinjaNinja32
ddf66a5f39 fix slime core injecting not working 2015-12-12 21:56:37 +00:00
PsiOmegaDelta
fd14a90c34 Merge pull request #11673 from comma/dev-freeze 
Impulse directions and zombie vomit
 2015-12-12 16:38:36 +01:00
Chinsky
36803747a2 Merge pull request #11445 from Kearel/fluff2 
[FEATURES] Adds entertainment items
 2015-12-12 16:49:01 +03:00
Chinsky
637abb5d12 Fixes #10597 2015-12-12 15:29:10 +03:00
PsiOmegaDelta
a731571d60 Merge pull request #11670 from comma/norandom 
Fixes #9197
 2015-12-12 12:45:13 +01:00
Chinsky
e89eae05bb Fixes #9197 2015-12-12 14:23:00 +03:00
Chinsky
1927d1744f Fixes #11667 2015-12-12 13:57:26 +03:00