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

21718 Commits

Author SHA1 Message Date
PsiOmegaDelta
b919181452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/turfs/simulated/wall_attacks.dm
 2015-12-28 19:44:19 +01:00
GinjaNinja32
3dfb821eed add revision topic call 2015-12-28 17:25:37 +00:00
PsiOmegaDelta
949d3d0c7f Merge pull request #11770 from Baystation12/master 
Dev-feeeze
 2015-12-28 16:32:46 +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
ccomp5950
8614484408 Hidden doors when open can be seen through. 
Fixes #11765
 2015-12-27 19:17:21 -05:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks. 
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
 2015-12-27 17:44:53 +01:00
Sebastian Broberg
14393ea706 Few refraction 2015-12-27 17:05:08 +01:00
PsiOmegaDelta
00b556e768 Merge pull request #11762 from Baystation12/dev-freeze 
Dev
 2015-12-27 16:10:04 +01:00
PsiOmegaDelta
45a55db766 Merge pull request #11761 from Baystation12/master 
Dev-freeze
 2015-12-27 16:04:26 +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
Chinsky
976666dcc9 Merge pull request #11747 from PsiOmegaDelta/151224-ByeByeForeverClown 
Fixes #11745.
 2015-12-26 19:24:47 +03: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
Sebastian Broberg
370529bc42 Refractored soulstone.dm 
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
 2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7 Boop, logic escaped me also refractor this shit someone. 2015-12-25 11:30:33 +01:00
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
Zuhayr
d5124057fe Merge pull request #11751 from GinjaNinja32/master-examine 
fix human examine gender
 2015-12-25 14:05:06 +10:30
GinjaNinja32
04006f5b9e fix human examine gender 2015-12-25 01:06:35 +00:00
GinjaNinja32
34b8c99d52 backport fix for #10705 from dev 
fix #10705
 2015-12-25 00:56:16 +00:00
Sebastian Broberg
ebef6272b9 Fixes #11711 
Should fix it.
 2015-12-24 23:02:37 +01:00
PsiOmegaDelta
b0aa56089e Fixes #11745. 2015-12-24 19:11:32 +01:00
PsiOmegaDelta
6617ab6bf9 Merge pull request #11744 from Ccomp5950/fix_ai_malf_dualism 
AI Malf will no longer be able to spawn a non-antag AI
 2015-12-24 19:10:34 +01:00
ccomp5950
ccda750ee1 AI Malf will no longer be able to spawn a non-antag AI 
fixes #10554
 2015-12-24 12:26:56 -05:00
GinjaNinja32
0bd51d2712 make vote window closeable via normal means 2015-12-24 05:28:18 +00:00
Sebastian Broberg
90f27ca42c Fixes chemgrenades 
Fixes #11686
 2015-12-23 23:46:53 +01: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
8ce1b47943 Using the multitool on equipment now adds a set of fingerprints. 2015-12-23 13:33:52 +01:00
PsiOmegaDelta
a1da886768 Unsnowflakes windows being crushed by doors. 2015-12-23 13:10:13 +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
Ccomp5950
8d379c5f92 Merge pull request #11731 from headswe/vent-scrubber-hibernate-fix 
Replace spawn hibernation with timestamp, fixes hibernation on vent_pump/scrubber
 2015-12-22 21:43:52 -05: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
Sebastian Broberg
4656f50365 Fixes indention on comment and fixes missing = 2015-12-22 17:44:27 +01:00
Sebastian Broberg
eb00f3138a Fix for variable still being used. 2015-12-22 17:25:11 +01:00
Sebastian Broberg
9643b6914e Removes timestamps in favor of spawn 
Also makes hibernation work
previous implementation was outdated and incorrect.
 2015-12-22 17:18:29 +01:00
Zuhayr
94000d9d39 Removed minimum ages. 
Conflicts:
	code/game/jobs/job/assistant.dm
 2015-12-22 13:24:56 +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
Zuhayr
acc0ae31d7 Added minimum ages to head roles. 
Conflicts:
	code/game/jobs/job/medical.dm
 2015-12-22 13:23:23 +01:00
PsiOmegaDelta
a95927d653 Merge pull request #11728 from Baystation12/dev-freeze 
Dev
 2015-12-22 12:08:45 +01:00
PsiOmegaDelta
d7eaed8c67 Span correction. 2015-12-22 10:59:33 +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