coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,526 Commits 9 Branches 11 Tags
f9a0fe6b2fc8a7c55c58b6066ecb49b22493a129
Commit Graph

10909 Commits

Author SHA1 Message Date
JJRcop f9a0fe6b2f Makes the drone internal storage much more user-friendly 2014-09-14 04:57:30 -04:00
Remie Richards 473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Cheridan 304b89bdc0 Merge pull request #4776 from Miauw62/radiodeaf 
Fixes "seeing" people speak over the radio while deaf.
 2014-09-11 08:42:18 -05:00
Cheridan b0ab0754e1 Merge pull request #4772 from Aranclanos/carpmeat 
Fixes a bug where you couldn't get meat from carps and several other mobs.
 2014-09-11 08:21:36 -05:00
Hornygranny 1bc6c36593 fixed typo 2014-09-11 01:55:07 -07:00
Miauw e557cbb263 Fixes "seeing" people speak over the radio while deaf. Fixed #4768 2014-09-10 14:19:42 +02:00
Cheridan 88471ff0d6 Merge pull request #4622 from Ikarrus/hivemindpaygate 
Hivemind Communication (:g) must be purchased before use
 2014-09-10 07:09:55 -05:00
Cheridan 81611c8f1a Merge pull request #4723 from Miauw62/now_recording_input 
Prevents voice analyzers using their own speech as input.
 2014-09-10 07:08:05 -05:00
Cheridan 9550d3e844 Merge pull request #4729 from Miauw62/corgemotes 
Makes simple_animals able to emote again
 2014-09-10 07:06:39 -05:00
Aranclanos de35b75fad Fixes a bug where you couldn't get meat from carps and several other mobs. 2014-09-10 07:30:31 -03:00
Cheridan 6c5f0fe355 Merge pull request #4744 from Ikarrus/lizardthugs 
ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
 2014-09-09 17:30:39 -05:00
Cheridan 0a35c2c740 Merge pull request #4749 from phil235/VomitMsgFix 
Vomit message fix
 2014-09-09 17:18:07 -05:00
Cheridan 12a926ae9e Merge pull request #4532 from hornygranny/smoothaliens 
alium update
 2014-09-09 14:54:43 -05:00
Hornygranny 5f33e3d713 old alien sprites, description updates 2014-09-09 11:21:41 -07:00
Cheridan cb834f6f29 Merge pull request #4746 from kyrahabattoir/goodbyeRussian 
Because aparently we can't have nice things.
 2014-09-09 12:51:20 -05:00
ikarrus f0c2cfee5e Bundled hivemind DNA exchanging 2014-09-09 09:37:28 -06:00
Cheridan d2bfc9c60a Merge pull request #4716 from Incoming5643/clownship 
[Map] Makes the clown ship entirely out of bananium
 2014-09-09 08:29:18 -05:00
phil235 a4de7ac6a1 Vomit message fix 2014-09-08 22:39:07 +02:00
KyrahAbattoir 20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
Cheridan 89aebe05b9 Merge pull request #4699 from Ikarrus/sscargo 
Adds Space Suit Crate to cargo
 2014-09-08 06:58:28 -05:00
Hornygranny 89850cfd2b fixed fucked spacing from resolver 2014-09-07 21:39:10 -07:00
ikarrus 399d2844e5 ENFORCE_HUMAN_AUTHORITY now only applies to Command positions 
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
 2014-09-07 22:33:56 -06:00
Hornygranny 02e527e938 Merge branch 'smoothaliens' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
 2014-09-07 21:33:48 -07:00
Hornygranny 2fac982191 alien nightvision moved to carbon/alien 
random lines fixed
 2014-09-07 21:16:32 -07:00
Orange Borg 0e05203e1a Don't tell GIA 
2fast goofball
 2014-09-08 15:55:04 +12:00
Cheridan db177765eb Merge pull request #4736 from phil235/DrillMsgFix 
fix for mob drilling message
 2014-09-07 22:42:29 -05:00
Cheridan cd34be6151 Merge pull request #4521 from Incoming5643/summonevents 
Magic Mania $1.75: Summon events
 2014-09-07 22:34:26 -05:00
Cheridan 7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All 
Silicon Medical and Security HUDs!
 2014-09-07 20:01:12 -05:00
Cheridan 866dbb7959 Merge pull request #4634 from Carn/timSort 
TimSort for byond
 2014-09-07 19:52:02 -05:00
phil235 3a12a4bfe8 fix for mob drilling message 2014-09-08 02:34:14 +02:00
Cheridan 0d1b47eaec Merge pull request #4627 from Aranclanos/pipenetsandpipestwo 
Pipes and pipenets
 2014-09-07 19:12:16 -05:00
Cheridan 903b0c9991 Merge pull request #4704 from Ikarrus/minorhuehuehue 
Added some <BR>s to Minor Announcements
 2014-09-07 16:58:48 -05:00
Incoming 6f43bc7bcb Makes the ship airless again 
Color = "#FFFF00"'s all components of the ship proper that can't be made out of bananium to simulate the experience
 2014-09-07 14:40:54 -04:00
ikarrus 0e27dc6b39 Resolved Conflicts: 
code/modules/mob/living/say.dm
 2014-09-07 10:58:13 -06:00
Miauw 877bd04fa1 Makes simple_animals able to emote again??? Fixed #4669 2014-09-07 17:46:02 +02:00
Cheridan 6bde58d70d Merge pull request #4702 from Miauw62/sleepen 
Balance changes to the sleepy pen.
 2014-09-07 10:38:00 -05:00
Cheridan ec7b0bb76f Merge pull request #4681 from Incoming5643/SMESroom 
[MAP] Moves the SMESiesae
 2014-09-07 10:06:13 -05:00
Alex 8f81a0e766 Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff 
Removed unnecessary messages when welding
 2014-09-07 15:08:01 +01:00
Alex 4b68902554 Merge pull request #4678 from Ikarrus/turretcontrolicon 
New icon for Turret Control Panels
 2014-09-07 15:05:38 +01:00
Alex b7aad470a0 Merge pull request #4705 from Ikarrus/humanmasterrace 
Config Option to Bar Lizards from Authority Roles
 2014-09-07 15:02:45 +01:00
Miauw cfe2f63b19 Prevents voice analyzers using their own speech as input. Fixed #4670 2014-09-07 13:45:04 +02:00
Incoming 2056389ccc Merge branch 'master' of https://github.com/tgstation/-tg-station into SMESroom 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-09-06 15:49:35 -04:00
ikarrus 4230894dec Merge branch 'master' of https://github.com/tgstation/-tg-station into hivemindpaygate 
Resolved Conflicts:
	code/modules/mob/living/say.dm
 2014-09-06 12:59:08 -06:00
Alex 574d5248d4 Merge pull request #4600 from Menshin/2Spooky5Playing 
Fixes skeletons unable to play xylophone on their ribcage
 2014-09-06 19:13:50 +01:00
Alex 9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup 
Nuke Ops Update
 2014-09-06 19:10:38 +01:00
Alex c854ef6667 Merge pull request #4703 from Ikarrus/beepboopiamthelaw 
Securitrons will only arrest unidentifiable persons when ID check is on
 2014-09-06 19:10:07 +01:00
Alex 7a9aeaf15f Merge pull request #4711 from Ikarrus/consistentwelds 
Consistent welding sounds
 2014-09-06 19:08:53 +01:00
Alex 4ee5afe5a0 Merge pull request #4700 from Ikarrus/syndicatecrate 
Adds high-end Syndicate crate to cargo
 2014-09-06 19:08:35 +01:00
Alex 8fff1aa0c7 Merge pull request #4701 from phil235/goldschlagerfix 
fixing the icon of goldschlager glass
 2014-09-06 19:08:02 +01:00
Alex 5e367a0e37 Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos 
Logging to add/remove memo
 2014-09-06 19:07:54 +01:00