cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-09 17:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 74 Branches 23 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

6049 Commits

Author SHA1 Message Date
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02:00
Zuhayr
130ff67414 Merge pull request #9902 from Baystation12/dev-freeze 
Dev freeze
 2015-06-23 20:53:38 +09:30
Chinsky
8bb0f7496e Merge pull request #9900 from mwerezak/extinguisher 
Changelog, fire patting
 2015-06-23 06:46:34 +03:00
mwerezak
4961efec0f Adjusts patting to account for shorter timeout 2015-06-22 22:17:30 -04:00
PsiOmegaDelta
9698def0e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/nano/modules/human_appearance.dm
 2015-06-22 16:59:19 +02:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher 
Fire Extinguishers
 2015-06-22 15:36:55 +01:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze 
Antag system fixes
 2015-06-21 12:07:50 +01:00
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot 
Fixes #9514
 2015-06-21 09:03:00 +02:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
a4fb9fbb51 Patting out flames is no longer extremely effective 2015-06-21 00:44:14 -04:00
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
 2015-06-20 20:40:06 +02:00
PsiOmegaDelta
4a5da7221c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/resist.dm
 2015-06-20 20:24:05 +02:00
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze 
More fixes
 2015-06-20 19:05:32 +02:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev 
Fixes
 2015-06-20 17:27:26 +01:00
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8 Fixes #9435 2015-06-21 01:27:23 +09:30
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver 
Assorted small dev-freeze tweaks, stunrevolver fix
 2015-06-21 01:16:58 +09:30
Zuhayr
e13c4a2243 Fixes #7828 2015-06-20 21:57:03 +09:30
Zuhayr
1e56cc0914 Fixes #9836 2015-06-20 21:43:54 +09:30
PsiOmegaDelta
22d0f6ab83 Compilation fixes. 2015-06-19 10:25:43 +02:00
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
 2015-06-19 10:19:08 +02:00
HarpyEagle
ccb12556d6 Fixes #9624 2015-06-18 16:31:29 -04:00
HarpyEagle
44644d34b4 Restores stop drop and roll time 
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
 2015-06-18 12:55:31 -04:00
HarpyEagle
5c1499ff1f Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver 2015-06-18 12:54:43 -04:00
HarpyEagle
4b441bc293 Adjusts animate_tail_once duration 2015-06-18 12:53:20 -04:00
PsiOmegaDelta
341b29c34a Merge remote-tracking branch 'upstream/dev' into 150614-MakingYourLifeEvenEasierApplyDirectlyToForehead 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-17 16:10:26 +02:00
PsiOmegaDelta
6ed7cee041 mob/living/Life() now handles even more regular hud updates. Relocates action handling. 2015-06-17 16:09:13 +02:00
PsiOmegaDelta
9d38bcc149 mob/living/Life() now handles regular status updates. 2015-06-17 16:01:26 +02:00
HarpyEagle
b26edd690c Certain sidearms now use the lighter gunshot sound 2015-06-17 09:59:40 -04:00
PsiOmegaDelta
d4b2fb7176 mob/living/Life() now handles regular hud updates. 2015-06-17 15:47:24 +02:00
PsiOmegaDelta
b98d64b668 mob/living/Life() now handles processing grabs. 2015-06-17 15:41:25 +02:00
PsiOmegaDelta
225ed82c1c mob/living/Life() now handles can move. 2015-06-17 15:38:53 +02:00
PsiOmegaDelta
838739c4ed mob/living/Life() now handles updating pulling. 2015-06-17 15:35:41 +02:00
PsiOmegaDelta
9887f16135 mob/living/Life() now has basic gravity handling (no overrides). 2015-06-17 15:32:23 +02:00
PsiOmegaDelta
c8b7a77399 mob/living/Life() now handles stomach contents. 2015-06-17 15:19:41 +02:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch 
Reagent splashing, mob fire
 2015-06-17 10:05:11 +01:00
mwerezak
73333ac9c8 Moves metabolism to a holder subtype 2015-06-16 16:26:06 -04:00
mwerezak
70433b4367 Makes showers wash away touching reagents 
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
 2015-06-16 16:26:04 -04:00
PsiOmegaDelta
5ac575f579 Yet another span fix. 2015-06-16 11:09:36 +02:00
PsiOmegaDelta
307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
 2015-06-16 10:30:50 +02:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records 
'Fixes' NanoUI locking up on medical/security records
 2015-06-15 15:30:08 +02:00
GinjaNinja32
0423691ca2 Missed a span 2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00