cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-25 16:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,081 Commits 75 Branches 23 Tags
d74b8f9dc3fc4bbf9d39962ea1ea6eda86ee71ab
Commit Graph

6044 Commits

Author SHA1 Message Date
PsiOmega
1a11aa7f5c Shuffles de-equipping logic. 2015-08-24 14:24:31 +02:00
PsiOmegaDelta
3de6d1b19c Merge pull request #10381 from Zuhayr/hardsuitcontrol 
Rig AI movement and module control buffs.
 2015-08-24 12:04:31 +02:00
Zuhayr
c5972cb421 Removing an istype() check. 2015-08-24 19:03:57 +09:30
Zuhayr
c6964a9b0e Fixes for previous commits. 2015-08-24 18:31:52 +09:30
PsiOmegaDelta
e29f4eb3c1 Compilation and map merge fixes. 2015-08-24 10:45:08 +02:00
PsiOmegaDelta
9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
Zuhayr
e8bf2e4b8f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 2015-08-24 16:41:39 +09:30
Zuhayr
ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
Kearel
e8b779a34a language bug fix 2015-08-23 22:37:32 -05:00
mwerezak
5bcede5801 Fixes adjustBrainLoss 
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
 2015-08-23 20:22:15 -04:00
Chinsky
13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix 
Fixes limb stump examine text
 2015-08-24 00:31:05 +03:00
Ccomp5950
517b685950 Merge pull request #10822 from mwerezak/antag-fix 
Antag Fixes
 2015-08-23 16:24:42 -04:00
mwerezak
3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -04:00
mwerezak
161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
PsiOmega
579c5be239 Makes observers use forceMove. 
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
 2015-08-23 17:45:46 +02:00
volas
d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00
Zuhayr
9cbacd6653 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/click.dm
 2015-08-23 02:24:34 +09:30
GinjaNinja32
222049dd3c Merge pull request #10791 from Zuhayr/speciestweaks 
Species tweaks
 2015-08-22 17:50:43 +01:00
Zuhayr
90e51b87e3 Refactoring hardsuit click checking. 2015-08-23 02:14:55 +09:30
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
PsiOmegaDelta
8f431c3832 Merge pull request #10801 from mwerezak/movement-cooldown 
Adds missing TK move cooldowns, fixes #10800
 2015-08-22 10:50:13 +02:00
mwerezak
a9f6d01647 Fixes #10800 
Also does some minor refactoring and removes a duplicate check
 2015-08-22 01:55:26 -04:00
Chinsky
bd9b6fd4c6 Merge pull request #10771 from DelZeta/MRGLGRGLGR 
Fixes permahallucinations.
 2015-08-22 05:33:34 +03:00
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
1d13b989df Gluttonous var changes. 2015-08-22 03:33:18 +09:30
Zuhayr
23fa130d6a Species attack damage nerfs. 2015-08-22 03:33:18 +09:30
Zuhayr
6841776992 Taj/Unathi slowdown and burn/brute malus tweaks. 2015-08-22 03:33:18 +09:30
Zuhayr
69dfd23d1b Compile fix. 2015-08-22 03:26:41 +09:30
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/rig.dm
 2015-08-22 02:36:05 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
a234d8b096 Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums 
Admin secret panel refactor.
 2015-08-22 02:18:39 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
1e7251ded4 Id card handling changes. 
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
 2015-08-21 14:04:06 +02:00
DelZeta
54dd93997d Useful procs are useful. 2015-08-20 20:24:15 -07:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00