cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,733 Commits 74 Branches 23 Tags
f702f99f14f28201e67744c2025f507d2c4f4745
Commit Graph

1241 Commits

Author SHA1 Message Date
LordFowl
f85e66640b Compatibility Patch 
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
 2016-05-05 20:32:40 -04:00
LordFowl
c7ca0887e7 Vaurca Changes 
Various vaurca-based changes, as detailed in the changelogs.
 2016-05-05 19:10:05 -04:00
skull132
3e8ac5ee39 Vampire Re-write: Block 1 
The largest chunk of this rewrite.

Reworks the vampire powers, and makes them completely modular, as with changeling. Also adds a few powers, and so on.

A massive list of TO-DOs remains.
 2016-04-26 20:29:14 +03:00
skull132
f24b15fa76 Merge pull request #236 from Aurorastation/development 
Development Merge - 25MAR2016
 2016-03-25 22:35:35 +02:00
skull132
3d3dbcb8f0 JMP logs for days 
Adds JMP messages to most forms of physical attacks.
 2016-03-25 18:27:37 +02:00
Hubblenaut
421fcc7f5e Amends gargle blaster recipe 2016-03-12 14:52:39 +01:00
Hubblenaut
99a3af04b0 Fixes two bar recipes 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2016-03-12 14:51:40 +01:00
Talkarcabbage
c5803ea64f Made water-coolers wrenchable. 2016-03-10 02:38:43 -06:00
Ryan784
58a387509c Multiple Pills Fixes #97 
Fixes Chemmasters asking the user three times how many pills they wish
to create.
 2016-02-11 19:07:06 -05:00
Ccomp5950
bd60099a7e Removes unused pressure_resistance variable. 
This is used with FEA not ZAS

Though it's kind of funny to look at what some of these values were set at.
(For reference: ONE_ATMOSPHERE = 101.325)
 2016-02-03 18:17:52 -05:00
Ryan784
90318f09aa Fuel Tank Disarming 
Admins and Mods can once again disarm a fueltank as a ghost by clicking
on it.
 2016-02-03 13:05:57 -05:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
PsiOmegaDelta
1c04164a2a Can now expand monkey cubes. 
Apparently open containers don't call afterattack. Marks monkey cubes as closed. Fixes #12085.
 2016-01-31 14:19:54 +01:00
Kelenius
f6295fa643 Fixes #120 2016-01-28 12:04:52 +01:00
skull132
205ed7ed42 Merge remote-tracking branch 'origin/just-in-case' 
# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.
 2016-01-28 01:32:20 +02:00
PsiOmegaDelta
21c8920271 Fixes food and radiocarbon spectrometer reagent injection. 
Fixes #11913. Fixes #12048.
 2016-01-27 11:22:46 +01:00
skull132
eb7c3f9922 Merge pull request #20 from Ryan784/gold-slime 
Gold slime
 2016-01-24 23:12:31 +02:00
skull132
8c6544d033 Merge pull request #15 from FelisCorax/hair_eating_machines 
Hair eating machines
 2016-01-24 23:11:59 +02:00
Ryan784
5f655dbbdb Vampire Gamemode Developement Test 
The Vampire gamemode, as ported right now. The gamemode is in, as well
as creating a vampire through the traitor panel. All abilities seem to
function, unable to test enthrall however (though I have a feeling it
will have to be redone). Enthralling someone without a CKey will give
you the correct response, however.

Any abilities having to do with lums will need to be redone. Vamphud as
well.

If looking over this and pointing out errors/fixing is faster than
simply porting it yourself, then feel free to do so!
 2016-01-20 22:14:21 -05:00
Hubblenaut
0aa4f10013 Center_of_mass for snacks/dishes 2016-01-17 16:12:02 +01:00
PsiOmegaDelta
e745093acc Corrects snack macros. 2016-01-14 08:42:24 +01:00
Zuhayr
cc4c86c995 Fixes #270 2016-01-14 08:37:10 +01:00
Ryan784
aa499666c9 Gold Slime Extracts do stuff again 
Gold slime extracts, when mixed with 5u of water, have a chance of
spawning in mobs once again.
 2016-01-14 00:08:36 -05:00
FelisCorax
e85c19046f Copied machine hair eating code from current server. 2016-01-13 16:11:58 -05:00
Ryan784
f1e8e45777 Welder Bomb Delay 
Adds a delay to welder-bombing, and alerts mods/admins.
 2016-01-12 22:48:18 -05:00
Zuhayr
7439b7bcf4 Attempting to fix perma-wet-floors bugs. 2016-01-12 08:59:59 +01:00
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