cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,087 Commits 74 Branches 23 Tags
c20fd962008efe88843e9e81f08f1ac730e51a55
Commit Graph

988 Commits

Author SHA1 Message Date
skull132
1caff18271 Vampire - Frenzy 
Implements frenzy mechanics.
Frenzy is usually triggered by chaplain actions, or by being low on blood. It gives you the hulk gene and augments your vision, effectively turning you into a relatively powerful hunter.

To het out of it, you need to consume more blood.
 2016-05-14 15:04:12 +03: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
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
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
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
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
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
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire. 
#11537
 2015-12-16 17:59:05 +03:00
GinjaNinja32
0f2b17f7bb fix #11631 2015-12-10 13:01:06 +00:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
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
Chinsky
35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix 
Pepperspray and chem smoke fixes
 2015-10-26 05:42:59 +03: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
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
Kelenius
eef1013db2 Fixes #10925 
Makes psilocybin less robust, also cuts down emote spam
 2015-09-14 16:54:24 +03:00
GinjaNinja32
e29f5d108c fix pill attack_log entry, switch to using key_name 2015-09-14 06:24:49 +01:00
mwerezak
19b195cd27 Revert "Reverts #10649, fixes #10621" 
This reverts commit cb5df3963a.
 2015-09-09 21:12:24 -04:00
Daranz
ddeec9c89a Fix effects for clonexadone 2015-09-04 16:06:03 +02:00
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
mwerezak
75f19938b3 Fixes an apparent clonexadone typo 2015-08-24 00:04:03 -04:00
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
Kelenius
cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
PsiOmegaDelta
311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix 
Fixes overdose not working for ingested reagents
 2015-08-16 10:18:16 +02:00
mwerezak
5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
Kelenius
cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius
3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
Snapshot
3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix 
Fixes #10621
 2015-08-14 22:51:43 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50 Fixes #10621 
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
 2015-08-14 23:44:46 -04:00
mwerezak
133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
Chinsky
0056a889de Moved antibodies to the rest of reagents. 
Updates them to use new chem processing.
Also axes unused commented out code.
 2015-08-14 04:53:46 +03:00
PsiOmegaDelta
841f7f6db2 Compilation fixes. 2015-07-30 10:41:01 +02:00
PsiOmegaDelta
b6bd51828a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-07-30 10:38:44 +02:00
GinjaNinja32
7a6599fdf4 Add logging to potassium-water and nitroglycerin reactions 2015-07-29 12:36:00 +01:00
GinjaNinja32
84c7625490 Chemical logging improvements 2015-07-29 07:55:30 +01:00
PsiOmega
984d5ee337 More #10285 fixes. 
This one is dev-freeze only.  Adds another sanity check to trans_to_holder to avoid runtime issues.
 2015-07-26 10:46:58 +02:00