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
25,392 Commits 74 Branches 23 Tags
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

2695 Commits

Author SHA1 Message Date
PsiOmegaDelta
cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
 2015-06-30 08:24:43 +02:00
mwerezak
4062f81f20 Fixes #7910 
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
 2015-06-28 11:59:19 -04:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
mwerezak
56065022a7 Updates fire_act() implementations to work better with lower temperature fires 
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
 2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher 
Fire Extinguishers
 2015-06-22 15:36:55 +01:00
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes 
Dev-freeze Fixes
 2015-06-21 09:04:08 +02:00
mwerezak
712dc39185 Fixes #9729 2015-06-21 03:00:34 -04:00
mwerezak
2f1a6eaf83 Adjusts w_class of beach ball and scroll 2015-06-21 01:46:10 -04:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
6a8aeb0153 Makes fire extinguishers effective at putting out mob fires 
Doubles the amount of water extinguishers carry and quadruples the
amount of water sprayed with each use. Halves the damage taken by slimes
when exposed to water to compensate.

Also refactors chair propelling a bit.
 2015-06-21 00:43:15 -04:00
Zuhayr
89d6e529a7 Compile fix. 2015-06-20 23:14:09 +09:30
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
Zuhayr
c8c35acf3a Fixes #9785 2015-06-20 22:12:38 +09:30
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch 
Reagent splashing, mob fire
 2015-06-17 10:05:11 +01:00
mwerezak
f0c096627c Matches can be used to light things in adjacent turfs when thrown 2015-06-16 16:25:59 -04: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
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
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
Kelenius
86b080769c Fixes two log destroyers 2015-06-14 15:54:07 +03:00
GinjaNinja32
d31cf8f3d8 Merge pull request #9786 from LightningIron/dev-freeze 
Welding tool bugfixes
 2015-06-11 09:42:21 +01:00
unknown
fe2ce02f54 Fixes #9744. 2015-06-10 21:50:48 -05:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master 
Dev-freeze.
 2015-06-10 11:04:54 +02:00
Zuhayr
84ae0dd3d1 Merge pull request #9768 from LightningIron/master 
Fixes #9731 and #9469
 2015-06-10 13:35:41 +09:30
mwerezak
8007d42783 Adjusts usages of reagent transfer procs 
Adds splash() proc for futureproofing.
Replaces instances of splash_mob() with splash()
Replaces instances of trans_to() with splash() where appropriate.
 2015-06-10 00:03:08 -04:00
unknown
13a43e6cfd Changes description update spawn() to use 0 instead of small decimal. 2015-06-09 22:35:16 -05:00
unknown
2dbd0ac007 Fixes formatting for spawn() before updating description. 2015-06-09 22:02:14 -05:00
unknown
b1368fb712 Changes chemgrenade time in description to be correct after failed detonation. 2015-06-09 19:51:33 -05:00
unknown
17488168ab Fixes for #9731 and #9469. 2015-06-09 18:49:09 -05:00
Chinsky
bb824dba42 Merge pull request #9721 from atlantiscze/apcfix 
Refactors /obj/item/apc_frame to /obj/item/frame/apc
 2015-06-07 12:43:01 +03:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmegaDelta
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap 
Adjusts how reagents_explosion applies bombcap.
 2015-06-07 08:50:45 +02:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc 
- This fixes broken APC frame placement on walls - #9537
 2015-06-07 06:26:10 +02:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze 
Fixes #9597
 2015-06-07 03:14:06 +01:00
Atlantis
4b19e8be69 Fixes #9548 
- AI's name is now correctly displayed when the AI is clientless while being grabbed with intellicard.
- AI's wireless radio is no longer automatically muted when the AI is transferred to intellicard. It may still be muted from the UI if the intellicard's owner wants it.
 2015-06-06 06:28:46 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
GinjaNinja32
67ccb6997b Entirely removes briefcase instastun and pointless New() definition 2015-06-05 09:00:19 +01:00
GinjaNinja32
2507a8007b Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head 2015-06-05 01:10:15 +01:00
PsiOmegaDelta
65fc980b20 Stack splitting and cable merging fixes. 
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
 2015-06-04 13:24:12 +02:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes 
Fixes
 2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551 Fixes #9640 2015-06-02 22:00:34 -04:00
GinjaNinja32
c1cc002109 Merge pull request #9601 from Techhead0/survivalBox 
Survival box and job spawning fixes.
 2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Zuhayr
fd2855800f Merge pull request #9582 from mwerezak/robolimbs 
limb fixes
 2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be Sets w_class for external organs 
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
 2015-05-30 19:02:37 -04:00
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30