Commit Graph

7401 Commits

Author SHA1 Message Date
Cheridan 397b2f07e8 fixes 2014-01-08 10:42:12 -06:00
Cheridan 937ac275ff Upgradeable Laser Pointers!
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
2014-01-07 19:54:51 -06:00
Cheridan 9bff546dad Merge pull request #2245 from Nienhaus/master
Side Part hair
2014-01-06 13:48:35 -08:00
Cheridan 49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
2014-01-06 13:40:04 -08:00
Giacom a219896082 Merge pull request #2241 from ChuckTheSheep/explosiveoptimization
Explosion Optimizations
2014-01-06 13:07:05 -08:00
Cheridan 26d3d03d69 Merge pull request #1906 from Aranclanos/GiaPlsFix
Removed the need of input and output objects for the mining machinery
2014-01-05 14:23:28 -08:00
Giacom 3c84e37160 Merge pull request #2235 from AndroidSFV/fix2221
Resolves #2221
2014-01-05 06:52:47 -08:00
Nienhaus 9e798d1890 Side Part hair
Someone requested side parted hair so I did it.
Image: http://puu.sh/6apZJ.png
2014-01-05 08:34:24 -06:00
Cheridan bf9fa21ddc Merge pull request #2149 from Miauw62/kittens
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan e71314d4eb Merge pull request #2199 from Perakp/buckleFix
Buckle fix
2014-01-04 19:51:59 -08:00
Cheridan db67b90968 Merge pull request #2218 from Incoming5643/bombrefactor
Refactors syndicate bombs to remove the var degutted
2014-01-04 19:44:25 -08:00
ChuckTheSheep b3635a2935 small fixes 2014-01-04 20:03:22 -05:00
ChuckTheSheep e71f98bbb8 Explosion Optimizations
Implements a trange that internally checks only turfs and thus less
intensive.
2014-01-04 19:29:17 -05:00
AndroidSFV fe6f217d6f Adds logging to emagged borgs using their stun arm. 2014-01-04 04:00:16 -06:00
Incoming 50838d701d Adds attack logging to learning spells from one time use spellbooks and casting of spells. 2014-01-03 17:40:32 -05:00
Cheridan 5426868c53 Merge pull request #2178 from errorage/2013_12_29_scalable_ui
Adds framework for multiple UI styles for humans, with a no-UI mode being the first example. Also makes all mobs' UIs scalable.
2014-01-03 14:23:08 -08:00
Giacom 12f13456ae Merge pull request #2207 from Cluwnes/tcomrades
Added ckey + real_name logging to server logs for "NTLS"
2014-01-03 13:57:03 -08:00
Miauw 61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
Razharas 80b592d0b3 Resolving conflicts
God hates git
And so do i
2014-01-03 21:12:14 +04:00
Giacom 537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Aranclanos b5fc39236f changes strings to paths on the mining machinery code 2014-01-03 03:23:28 -03:00
Incoming 58800659de The prequeisite Gia related code beautification pull 2014-01-02 15:00:29 -05:00
Giacom 09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
Giacom 0cd059432e Merge pull request #2135 from ChuckTheSheep/patch-2
Fixed an oversight in Wizard-Spell targeting code
2014-01-02 10:33:27 -08:00
Giacom b2e53335f0 Merge pull request #2167 from rymd/text-fix
Fixed destructive analyzer failure messages
2014-01-02 10:32:32 -08:00
Giacom 6e5e5efb5b Merge pull request #2184 from Cluwnes/invisimessages
Adds ckey logging to PDA message sending
2014-01-02 10:32:01 -08:00
Giacom 70a4d8e9af Merge pull request #2192 from Cheridan/iDidThisByHand
Obsoletes flags = FPRINT | TABLEPASS*
2014-01-02 10:31:46 -08:00
Giacom c56cc9c89f Merge pull request #2122 from Miauw62/disposalsfix
Disposals will no longer create invisible floor tiles.
2014-01-02 10:30:12 -08:00
Incoming de972e3b02 Refactors syndicate bombs to remove the var degutted.
The bombs themselves no longer explode, the payloads (which now actually exist in the bombs) do.

This means that you can play cruel jokes on people by activating bombs with removed payloads or easily code in other kinds of payloads (there'll be a future pull with a few from me at the very least) and not have to touch the bomb code itself.
2014-01-02 12:20:05 -05:00
Cheridan 68362d7b49 fixing conflicts
THANKS GIA

:I
2014-01-02 10:04:22 -06:00
Cheridan 3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
Giacom 248e6e94d7 Merge pull request #2170 from Rockdtben/throwAtRefactor
Refactored throw_at
2014-01-02 07:21:03 -08:00
Giacom 542aca21f8 Merge pull request #2186 from Cluwnes/theunknownchicken
Gives the chicken suit head some inv_flags
2014-01-02 07:20:27 -08:00
Razharas 06d1969fef Fixed some issues
No more suicider cloning
Added comments to the DNA and R&D wizardry
Added CLONE_INITIAL_DAMAGE define for the ammount of clone and brain
loss clones initially have in clonepod
Removed debug garbage
2014-01-02 09:27:51 +04:00
Razharas 8d6536821e Merge branch 'master' of https://github.com/tgstation/-tg-station into MachinesOverhaulANdR&D 2014-01-02 09:02:01 +04:00
Aranclanos 1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03:00
Cheridan 8006b75307 Merge pull request #2182 from Rockdtben/sayRefactor
Refactored how say deals with masks. As well as derp speech.
2014-01-01 14:46:04 -08:00
Cheridan 6c644f4652 Merge pull request #2185 from Cluwnes/itspersonnell
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
Cheridan 87e69e0515 Merge pull request #2206 from fleure/stabbystab
Fixed stabbing head with thick suit on
2014-01-01 14:28:29 -08:00
Cheridan 004c3d7be6 Merge pull request #2198 from Incoming5643/wands3
[Marble Madness] Improved Logging on the Bolt of Change
2014-01-01 14:14:49 -08:00
Cheridan b659a2b829 Merge pull request #2203 from Perakp/jauntFix
Fixes Ethereal Jaunt
2014-01-01 13:54:34 -08:00
Cheridan 5f3bfa028b Merge pull request #2191 from Incoming5643/SMconfusion
Changes the initialism for stat collecting on summon magic to SU
2014-01-01 13:42:12 -08:00
Giacom 4832398f88 Merge pull request #2181 from errorage/2013_12_29_dmg_overlay_thresholds
Changes damage overlay threshold from 10+ to 35+
2014-01-01 07:50:35 -08:00
fleure 4a01ed176c Fixed stabbing error message target check 2014-01-01 15:33:49 +00:00
Perakp ac9228bae1 Added an else message to make it clear you can't unbuckle while buckled.
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00
Cluwnes Honk 637c2ef9d3 Added ckey logging to server logs for "NTLS"
Standardizes the logging for message_admins() and adds realname and ckey logging to server logs. Also fixes a spelling error in the message_admins().
2013-12-31 18:30:58 -08:00
fleure 61f2cf9292 Fixed stabbing head with thick suit on 2013-12-31 23:39:30 +00:00
fleure be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Perakp a7ead625be Fixes Ethereal Jaunt
notransformation protection was stopping movement calls to the holder object.
Refractored code so wraith phase shift isn't copypaste just to change animations.
2013-12-31 17:28:50 +02:00
Perakp 4f6eba7f6a A proper fix for unbuckling while buckled. 2013-12-31 10:25:12 +02:00