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

1115 Commits

Author SHA1 Message Date
PsiOmegaDelta
0f44645a75 Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing 
Removes oxygen_agent_b and volatile_fuel gases
 2016-01-01 12:18:18 +01:00
Atlantis
9d1e6e017c Fixes chemical cartridge splashing 
- Fixes #11853
- Attempting to transfer reagents into the cartridge when it is closed will no longer splash the reagents.
 2016-01-01 01:43:53 +01:00
Atlantis
0d10e4b1ef Removes oxygen_agent_b and volatile_fuel gases 
- oxygen_agent_b wasn't used at all, except for filters which, for some reason filtered it in addition to phoron
- volatile_fuel was only used in two chemistry reactions as reaction result, it was replaced with gaseous phoron.
 2016-01-01 00:34:59 +01:00
PsiOmegaDelta
1e86e42359 Removes jar slime handling, whatever it was supposed to be. Fixes #11689. 2015-12-23 13:46:31 +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
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
Neerti
0e3f37570a Makes radiation medication not actually irradiate you worse. 2015-12-17 17:56:36 +01:00
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire. 
#11537
 2015-12-16 17:59:05 +03:00
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
 2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
GinjaNinja32
0f2b17f7bb fix #11631 2015-12-10 13:01:06 +00:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
PsiOmegaDelta
185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
 2015-12-08 08:23:10 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev. 
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
 2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
2312631508 Fixes #11510 
Splashing and external transfer now checks if the container is open
 2015-12-06 02:49:46 -05:00
Zuhayr
f2a7536807 Mops can now be wet in buckets or sinks. 2015-12-01 02:05:27 +10:30
Zuhayr
958e11387d POCKET SAND! 2015-12-01 02:04:10 +10:30
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
3dcd35508f Compilation fixes. 2015-10-27 13:43:30 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
 2015-10-27 13:08:33 +01:00
PsiOmegaDelta
dd855b5259 Compilation fixes. 2015-10-27 12:47:35 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-10-27 12:38:28 +01:00
Chinsky
35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix 
Pepperspray and chem smoke fixes
 2015-10-26 05:42:59 +03:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
 2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master 
Dev-freeze.
 2015-10-21 10:36:30 +02:00
PsiOmegaDelta
4c96cd62a7 Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. 2015-10-20 17:11:55 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision 
Overhauls humanoid vision handling.
 2015-10-15 19:15:28 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
HarpyEagle
e24313be2e Fix macro 2015-10-15 07:02:57 -04:00
mwerezak
27fe99bdf0 Reagent transfer now checks simulated var 2015-10-15 06:46:07 -04:00
mwerezak
d260b3bb18 Fixes #11300 
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
 2015-10-15 06:44:21 -04:00
mwerezak
dcde34512c Refactors pepperspray touch effect, adjusts pepperspray messages. 2015-10-15 06:42:08 -04:00
PsiOmegaDelta
2fcaaf80c7 Chemistry machinery fixes. 
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116. Fixes #11302.
 2015-10-15 11:31:57 +02:00
mwerezak
27429f7b0c Less copypasta 2015-10-15 01:59:04 -04:00
Mike
4db9677c88 Fixes pepperspray confusion 
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
 2015-10-14 14:49:52 -04:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
 2015-10-10 12:05:36 +02:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
PsiOmegaDelta
f3175becc0 Overhauls humanoid vision handling. 
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
 2015-10-05 08:48:47 +02:00