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

21590 Commits

Author SHA1 Message Date
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
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
GinjaNinja32
ea6cdd4f65 Merge pull request #11724 from Ccomp5950/I_Feel_NOTHING 
Fixes the icon for numbness.
 2015-12-22 03:00:51 +00:00
GinjaNinja32
ae7f59a23f Merge pull request #11725 from Ccomp5950/stumpy 
Stumpy hands and arms can no longer pull stuff out of bags and such.
 2015-12-22 03:00:21 +00:00
GinjaNinja32
073ef62976 Merge pull request #11723 from Ccomp5950/canisters 
Canisters now work in unpowered areas.
 2015-12-22 02:59:55 +00:00
ccomp5950
fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such. 
Resolves #11404
 2015-12-21 17:56:30 -05:00
Ccomp5950
9383dfb199 Merge pull request #11719 from Spamcat/devbugs 
Couple of dev fixes
 2015-12-21 15:51:50 -05:00
ccomp5950
5873a92df8 Fixes the icon for numbness. 
Resolves #11435
 2015-12-21 15:30:26 -05:00
ccomp5950
d574d60e26 Canisters now work in unpowered areas. 2015-12-21 15:00:25 -05:00
Jon
5e73b92bd4 Fixes the general flavour text field. 
The field was blanking each time it was opened to edit.
 2015-12-21 09:13:46 +01:00
Spamcat
597a7723c2 Fixed people being unable to dress up. 
this bug is 2lewd to stay on server
 2015-12-20 21:58:05 +03:00
Spamcat
3dfbffbcd2 Fixes #11681 2015-12-20 20:05:07 +03: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
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +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
ccomp5950
ce3587d867 Hallucinations no longer burn on the SuperMatter 2015-12-19 21:33:02 -05:00
Zuhayr
593759b4e3 Merge pull request #11713 from PsiOmegaDelta/151219-AIQdels 
AI qdel() improvements.
 2015-12-20 11:15:10 +10:30
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
Chinsky
9a156c56de Merge pull request #11513 from Karolis2011/Constructable_Cargo 
Constructable Cargo
 2015-12-19 09:18:45 +03:00
Chinsky
4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster 
No verbose cantouch check when not climbable
 2015-12-19 03:13:45 +03:00
PsiOmegaDelta
79f15fca01 Compilation fixes due to issues caused by merging https://github.com/Baystation12/Baystation12/pull/11617. 2015-12-18 09:33:14 +01:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows 
- Fixes #11465
 2015-12-18 20:12:46 +13:00
Hubblenaut
28919269ee Prevents blob from growing over asteroid walls 2015-12-18 07:59:49 +01:00