cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,822 Commits 74 Branches 23 Tags
90318f09aa213e66d8433f6b1133e522fec32e44
Commit Graph

20200 Commits

Author SHA1 Message Date
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
Ryan784
5f9018eeb8 Vampire Blood Immunity 
Vampires will no longer take toxin damage from blood infusions,
regardless of the type of blood it is.
 2016-02-02 18:21:45 -05:00
skull132
65a40bfa96 Merge pull request #39 from skull132/master 
Fixing Whitelist
 2016-02-02 00:46:34 +02:00
skull132
ec03d4ecc2 Debug Removal 2016-02-02 00:36:30 +02:00
skull132
32037cc407 Fixing Whitelists 
Why were you passing a datum into a field that was made up to use a string? Why. Did that seem like a good idea?
 2016-02-02 00:33:49 +02:00
skull132
0fa52eb9b7 Merge pull request #38 from skull132/master 
Quick Fixes For Jobs and Admins
 2016-02-01 22:19:01 +02:00
skull132
9796d23a18 Not whitelisting sec and synths 
Because no.
 2016-02-01 22:14:10 +02:00
skull132
f51572114b Admin logs for Mods 
Scrubs
 2016-02-01 22:13:26 +02:00
skull132
b8d5c57d79 Merge pull request #35 from skull132/master 
Changelogs & Quick Tweaks
 2016-02-01 19:06:36 +02:00
skull132
69e355fe9f Sec Related Tweaks 
* Tasers are projectiles once more.
* Handcuffs don't need level 2 grab to work.
 2016-02-01 18:59:02 +02:00
skull132
0b85a4321f Porting Zuhayr's Fixes For Forensics 2016-02-01 17:31:29 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
skull132
fcd393ee94 Merge pull request #33 from skull132/SQL-backend-import 
Sql backend import
 2016-02-01 16:11:10 +02:00
skull132
80e6b30245 Wind & Unwind Mob -> Toggle Wind 
Just a simple change to make the branch compatible with upper.
 2016-02-01 16:08:23 +02:00
skull132
179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import 
# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.
 2016-02-01 16:00:54 +02:00
skull132
be642de482 SQL based player whitelisting 2016-02-01 15:34:24 +02:00
skull132
1c167ac363 Merge pull request #11 from skull132/rifles-import 
Rifles import
 2016-01-28 02:06:32 +02:00
skull132
253ca5a295 Merge remote-tracking branch 'Lady_of_ravens/gloves' 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous.dm
#	code/modules/research/designs.dm

All conflicts cleared.
 2016-01-28 01:44:28 +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
30ecef95ed Merge pull request #3 from Ryan784/Vampire 
Vampire
 2016-01-28 01:20:53 +02:00
skull132
912fe7356e Merge remote-tracking branch 'Aurorastation/development' into new-engine 
# Conflicts:
#	code/__HELPERS/unsorted.dm
 2016-01-24 23:25:08 +02:00
skull132
0245e3300d Merge pull request #24 from Ryan784/AI-HUD 
Ai hud
 2016-01-24 23:12:55 +02:00
skull132
c83e8374d3 Merge pull request #23 from Ryan784/step-sounds 
Step sounds
 2016-01-24 23:12:50 +02:00
skull132
4c0867c922 Merge pull request #22 from Ryan784/Lawgiver-1.0 
Lawgiver
 2016-01-24 23:12:44 +02:00
skull132
78bd043dbd Merge pull request #21 from Ryan784/species-gloves-on-spawn 
Species gloves on spawn
 2016-01-24 23:12:37 +02:00
skull132
eb7c3f9922 Merge pull request #20 from Ryan784/gold-slime 
Gold slime
 2016-01-24 23:12:31 +02:00
skull132
1a452d1fd5 Merge pull request #18 from Ryan784/Non-human-glove-kits 
Non human glove kits
 2016-01-24 23:12:24 +02:00
skull132
51717d9c0e Merge pull request #17 from Ryan784/Remove-Horse-Mask-Spell 
Remove horse mask spell
 2016-01-24 23:12:10 +02:00
skull132
ed5ecab289 Merge pull request #16 from Mahzel/development 
MagLock integration + Prisoner suit management
 2016-01-24 23:12:03 +02:00
skull132
8c6544d033 Merge pull request #15 from FelisCorax/hair_eating_machines 
Hair eating machines
 2016-01-24 23:11:59 +02:00
skull132
e63c3d00c0 Merge pull request #14 from Mahzel/master 
Interns integration
 2016-01-24 23:11:53 +02:00
skull132
2bded92969 Merge pull request #10 from Ryan784/Welder-Bomb-Delay 
Welder bomb delay
 2016-01-24 23:11:41 +02:00
skull132
de8728986a Merge pull request #8 from Ryan784/Null-Rod-Conversion 
Null rod conversion
 2016-01-24 23:11:36 +02:00
skull132
df009a3307 Merge pull request #3 from skull132/telescience-import 
Telescience import
 2016-01-24 23:11:09 +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
Lord Lag
ee583b913d Vaurca Update 
Vaurca for ne code, now with better sprites
 2016-01-20 19:50:19 +00:00
skull132
87cdc3b247 Wind Proc And Player Panel Changes 2016-01-19 15:48:48 +02:00
skull132
5da7e3d699 Player Notes SQL 
Adds the SQL based notes system. Partially refractored to use the new DB procs and look neater.
 2016-01-19 14:55:01 +02:00
skull132
9310018dbd SQL Warnings 
Adds the SQL based warning system.
 2016-01-19 00:27:50 +02:00
skull132
0009eff042 Compile Fixes 
The engine is now mostly operational and should be working. Still need to check it's ability to produce power, that might not work. Or maybe it does. Dunno!
 2016-01-18 21:50:30 +02:00
FelisCorax
e2f63626f3 Stungloves, forcegloves, and watches, oh my! 2016-01-15 14:00:26 -05:00
Ryan784
40b86c142d Updated verbs 
Send message should work, also updated all the procs to their baystation
equivalent instead of simply using our old code (shoulda done this in
the first place)
 2016-01-15 02:35:36 -05:00
Ryan784
757c33ad84 AI-HUD and interface 
Adds back in AI buttons/interface, for easier access to verbs.

Send-Message and Take-Picture verbs for AI appear to be bugged/unusable,
holding off on fixing in case of any bay updates.
 2016-01-15 01:59:13 -05:00
Ryan784
1072aa68d9 Footstep Sounds + ASFX Tab 
Footstep sounds and the ASFX Tab is back! You can not only hear
footsteps once again, but enable/disable the voting sound.
 2016-01-14 18:28:09 -05:00
Ryan784
92c1ab268c Lawgiver reinstated 
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
 2016-01-14 16:54:26 -05:00
Ryan784
e46630b636 Specie specific gloves on spawn 
Adds the species specific gloves to their respective species on spawn
 2016-01-14 00:29:39 -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
Ryan784
8925e7ba34 Non-human glove supply crates 
Adds non-human glove supply crates to cargo
 2016-01-13 20:50:18 -05:00
Ryan784
a421658894 Remove Horse Mask Spell 
Adds back the ability for wizards to remove horse masks.
 2016-01-13 20:06:37 -05:00
Mahzel
dbf7fc178f Didn't paste? Oo 2016-01-13 23:37:21 +01:00