cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 21:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,106 Commits 74 Branches 23 Tags
d136181f8cf8a2fbde8dcd81cc9237aa28ec146f
Commit Graph

2814 Commits

Author SHA1 Message Date
skull132
aec33074de Merge pull request #285 from LordFowl/development 
Vaurca Changes + Map Batch
 2016-05-15 21:00:17 +03:00
LordFowl
c7ca0887e7 Vaurca Changes 
Various vaurca-based changes, as detailed in the changelogs.
 2016-05-05 19:10:05 -04:00
Lord Lag
edbec1962f Fixes #263, #235. Tweaks ED 
Asides from two small bugfixes, adjusts Emergency Doors.
 2016-04-17 14:09:31 +01:00
skull132
8b5c7bc2c5 Conflict resolution 
Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt
 2016-03-25 22:25:41 +02:00
skull132
17938853d5 Of Helper Procs & Dumbs 
Makes a mob/proc/can_use_hand(), which determines whether or not a mob can use a given hand.

Redefined in human.dm to check a hand's status and usability.
 2016-03-25 20:33:10 +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
skull132
3d90716324 Reworking hand usability checks; Fixes #200 
Hand usability checks are moved into `mob/living/carbon/human/put_in_l_hand()` and `put_in_r_hand()` respectively. This changes how `obj/item/attack_hand()` functions slightly.
 2016-03-25 17:32:49 +02:00
skull132
0a93920b54 Fixes #199 
No more cuffing people from tiles away.
 2016-03-25 01:56:29 +02:00
skull132
71b7758248 Merge pull request #228 from skull132/webinterface-integration 
Webinterface integration
 2016-03-24 20:49:18 +02:00
skull132
899f8cdbec contract_uplink device & data parsing fix 
A contract_uplink device has been added, for rounds where no TCs are to be given to antags, but access to the database is neat. Namely: heist.

The blacklist was removed, the issue proved to be carriage return characters breaking nanoUI. They are now removed.
 2016-03-24 01:26:36 +02:00
skull132
7e266649ea Syndicate Contracts - Initial Implementation 
Adds SQL database based syndicate contracts to be viewed from any uplink. These can be used as IC traitor objectives, but hopefully with more RP and stuff.
 2016-03-21 23:07:04 +02:00
Lord Lag
cc9079a69d Return of borers 
Borers brought up to spec.
 2016-02-27 15:55:52 +00:00
Lord Lag
1106cd7c1f Fixes #124 
Vaurca use name instead of a flag for mechanics.
 2016-02-15 16:14:33 +00:00
skull132
36dbadc106 Del() -> Qdel() 2016-02-07 14:59:21 +02:00
skull132
7be87fce5d Baton Buff 
Should near-insta stun normal people now.
 2016-02-02 14:56:01 +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
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
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
ed5ecab289 Merge pull request #16 from Mahzel/development 
MagLock integration + Prisoner suit management
 2016-01-24 23:12:03 +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
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
Mahzel
d5e2689336 MagLock integration 2016-01-13 22:57:13 +01:00
Ryan784
10765a4fad Welder Bomb delay 2.0 
This time without message_mods!
 2016-01-13 09:39:53 -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
Ryan784
5d6afbf749 Null Rod Conversion 
Null Rod conversion is no longer instantaneous, just like with
conversion a Cult Member will have the option to resist.
 2016-01-12 18:48:47 -05:00
Sebastian Broberg
90f27ca42c Fixes chemgrenades 
Fixes #11686
 2015-12-23 23:46:53 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous. 
#11370
 2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b pAIs no longer see custom emotes twice. 
fuck i spent way too much time on a single line fix
 2015-12-16 19:36:14 +03:00
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid. 
Fixes #10478
 2015-12-12 16:29:05 -07:00
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
HarpyEagle
93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -05: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
87648e86ef Fixes runtime when cleaning turfs with soap 
Partial fix of #11490
 2015-12-06 02:00:50 -05:00
mwerezak
b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions. 
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
 2015-10-29 16:55:58 +01:00
ccomp5950
bb93245ccd Fixes the tapping messages check. 
The check is now in Topic() instead of being based on the href link sent.

Resolves #11039
 2015-10-15 21:11:06 -04:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b Surgical kits can now contain their equipment. 
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
 2015-10-15 10:20:49 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00