Commit Graph

4867 Commits

Author SHA1 Message Date
skull132 39303fbcec Merge pull request #113 from skull132/master
Hotfix Roundup
2016-02-11 21:17:52 +02:00
skull132 4fd56183fc Can Pick Vox 2016-02-11 20:54:00 +02:00
skull132 860ac3b19f Merge pull request #80 from FelisCorax/empty_in_sink
Empty in sink
2016-02-11 18:45:26 +02:00
FelisCorax 5e4e000a28 emptying reagent containers in sink
filling/emptying syringes from sink
2016-02-08 21:39:08 -05:00
skull132 36dbadc106 Del() -> Qdel() 2016-02-07 14:59:21 +02:00
Ryan784 1e4745d2a8 Merge pull request #1 from skull132/master
Dev Flags
2016-02-03 16:10:07 -05:00
skull132 7be87fce5d Baton Buff
Should near-insta stun normal people now.
2016-02-02 14:56:01 +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 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 912fe7356e Merge remote-tracking branch 'Aurorastation/development' into new-engine
# Conflicts:
#	code/__HELPERS/unsorted.dm
2016-01-24 23:25:08 +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
skull132 5de3f05ae1 Initial Commit 2016-01-13 14:25:06 +02: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
ccomp5950 fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such.
Resolves #11404
2015-12-21 17:56:30 -05:00
Chinsky 4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster
No verbose cantouch check when not climbable
2015-12-19 03:13:45 +03:00
Loganbacca 07e81c059c Fixed bullets traveling diagonally through windows
- Fixes #11465
2015-12-18 20:12:46 +13:00
Hubblenaut dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +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
Atlantis 89f5c9f405 Fixes #11540 2015-12-02 11:27:28 +01:00
Bjorn Neergaard ef1f91e334 Fix Laptop Vendors and Personal Lockers not accepting ID Containers
Fixes #11092
2015-11-22 00:27:03 -06:00
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
Chinsky 35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
mwerezak 47ace5ed3e Chem smoke refactor 2015-10-18 11:54:17 -04:00