coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,421 Commits 9 Branches 11 Tags
031a98d14c7e6df2dfd8b7bab3dcd83c9338cd41
Commit Graph

17257 Commits

Author SHA1 Message Date
phil235 031a98d14c Merge pull request #9836 from AnturK/viral 
Makes viruses varedit friendly
 2015-06-25 14:09:50 +02:00
phil235 8e62d51812 Merge pull request #9801 from AnturK/rosebud 
Buffs whispers
 2015-06-25 13:39:56 +02:00
Razharas 454dc14b44 Merge pull request #10117 from Iamgoofball/explosive_implant 
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
 2015-06-25 12:49:03 +03:00
Iamgoofball 2cdb4dbe92 fixes 2015-06-24 22:07:46 -07:00
phil235 9b616daf8f Merge pull request #9837 from spasticVerbalizer/muteMessageFix 
Prevents 'unable to speak' spam on empty message
 2015-06-24 20:15:19 +02:00
Iamgoofball 33b9fc3a2c Update bottle.dm 2015-06-24 10:32:55 -07:00
Iamgoofball 9522feea87 phil says this fixes the armor problem TAKE 2 
expand dong
 2015-06-24 10:27:48 -07:00
Cheridan 56d4bf61b2 Merge pull request #10073 from Jordie0608/whoknowswherewewouldbewithoutcartography 
Fixes #10052, stat checks for child update_icon()
 2015-06-24 11:17:48 -05:00
Cheridan 054f19d4b4 Merge pull request #9965 from phil235/HandTeleFix 
Fixes handtele teleportation failing when the beacon is inside something.
 2015-06-24 10:40:04 -05:00
Cheridan 941fd2c102 Merge pull request #10046 from Ikarrus/rcradio 
Request Console Radio Notifications
 2015-06-24 10:33:00 -05:00
Cheridan 7568861a57 Merge pull request #10102 from xxalpha/chef 
Fixed being able to interact with electropack while wearing it.
 2015-06-24 10:07:45 -05:00
Iamgoofball ab36f89844 NUKE OPS START WITH MICROBOMBS NOW, nerfs microbombs because I made them way too powerful and 20 of them was actually double the bombcap 2015-06-23 21:37:21 -07:00
Iamgoofball 4294a583b0 Microbombs and Macrobombs 2015-06-23 15:36:01 -07:00
Iamgoofball 856edee625 WHOOPS 2015-06-23 12:57:28 -07:00
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
Cheridan 62e635484a Merge pull request #10069 from Ikarrus/gangrecruitnerf 
Gang Update: Recruitment Edition
 2015-06-23 14:33:13 -05:00
Cheridan c7e0b96314 Merge pull request #10083 from MrStonedOne/ISTHISVALID 
Admins can now reject shitty adminhelps
 2015-06-23 14:26:11 -05:00
Cheridan e3fa954daa Merge pull request #10025 from phil235/WindowBugFix 
Two window/windoor bugfixes
 2015-06-23 12:23:32 -05:00
spasticVerbalizer 2253a68c4b Merge conflict fix 2015-06-23 18:00:11 +02:00
Ikarrus 67ec200bc7 Few More Changes 2015-06-23 09:12:56 -06:00
Remie Richards 64f4adb41e Merge pull request #9510 from Cheridan/nuke_feedback 
Nuke Op COMMUNITY FEEDBACK PR
 2015-06-23 07:03:17 +01:00
Cheridan b7dc52856e Merge pull request #9867 from RemieRichards/PipePressureLethality 
Pipe Pressure Panic
 2015-06-23 00:16:25 -05:00
Cheridan ffedaeaeef Merge pull request #10072 from Ikarrus/shuttleloanclarity 
Cargo Shuttle Event Announcement Clarity
 2015-06-22 23:50:37 -05:00
Cheridan f1fbfd93e6 Merge pull request #10029 from RemieRichards/ArmourPenetration 
Armour Penetration and Armour Damage Reduction nerf
 2015-06-22 23:49:18 -05:00
Cheridan 7b6fdbc8ce Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier 
Ports watchlist flagging for ckeys
 2015-06-22 23:36:06 -05:00
Ikarrus 3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet 
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
 2015-06-22 22:57:53 -05:00
Remie Richards f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors 
New Bluespace/Sepia slime reactions, new var for turfs
 2015-06-23 03:43:28 +01:00
Remie Richards 95b2cc2b09 Merge pull request #10092 from TheVekter/dangerwillrobinson 
Danger Update: Meteors, Rods, Flux and Grav
 2015-06-23 03:39:41 +01:00
Remie Richards 4ac8dd2fa6 Merge pull request #10023 from palpatine213/Ifyouwantitdoneright 
Positronic Brain fixes
 2015-06-23 03:39:27 +01:00
TheVekter ab4a0ade28 fixed the changelog FOR REAL THIS TIME, also fixed bad coding 2015-06-22 21:30:50 -05:00
xxalpha 0d6ac5c30c Fixed being able to interact with electropack while wearing it. 2015-06-22 23:16:22 +01:00
phil235 3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing 
The Nanoing (Episode 2: The Fix Wars)
 2015-06-22 14:24:20 +02:00
TheVekter 6b5676bd7f Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore. 2015-06-22 01:19:12 -05:00
Cheridan 79d2358303 Merge pull request #10067 from Boggart/constructionpermitfix 
Fixes construction permits dissapearing even when usage fails
 2015-06-21 23:41:16 -05:00
TheVekter c2157b1a11 * Makes the Flux explosion bigger 
* Causes Immovable Rods to actually bisect the station
* Changes odds for more deadly Meteor Waves
* Fixes that FUCKING TEXT FOR MEATY ORE WAVES
 2015-06-21 20:03:14 -05:00
Razharas 1f147b662e Merge pull request #9832 from Iamgoofball/patch-73 
Adds trekchems to the Medibots.
 2015-06-22 03:06:31 +03:00
Iamgoofball b4498de02a Update Sleeper.dm 2015-06-21 17:00:49 -07:00
Iamgoofball 2d75f111c5 Adds trekchems to the Sleepers. 2015-06-21 16:59:23 -07:00
MrStonedOne 40c2ca5966 Tweaks adminhelp rejections and adds changelog 2015-06-21 13:23:42 -07:00
Razharas e6b738734a Merge pull request #8876 from xxalpha/fixfixfix 
Cyber Implants + (Pt.2)
 2015-06-21 22:12:17 +03:00
Fayrik 58301912e2 This was way too much work, so this had better work now. 2015-06-21 20:04:16 +01:00
MrStonedOne 9583b1213b Adds new timer subsystem 
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
 2015-06-21 11:55:38 -07:00
phil235 aa5541070c Merge pull request #10082 from xxalpha/bass 
Fixed not being able to insert a brain into an MMI.
 2015-06-21 19:33:45 +02:00
xxalpha 609d65af58 Fixed surgical step 'saw' not working properly on non humans. 
better
 2015-06-21 18:26:00 +01:00
xxalpha 3379fa5172 Fixed not being able to insert a brain into an MMI. 2015-06-21 17:50:03 +01:00
Ikarrus 75d444b836 Fixes Broken C4s 
Trying to place a C4 on an object will currently move the object onto your tile, and produce a runtime. This was because the code was trying to drop the target rather than the C4.
 2015-06-21 10:18:15 -06:00
Cheridan b1e252c69f Merge pull request #10021 from phil235/AIFloatFix 
Mobs that are anchored or buckled to something anchored no longer float in no gravity.
 2015-06-21 10:45:49 -05:00
Cheridan 5d6f812474 Merge pull request #10024 from palpatine213/CorgiVirusFix 
Fixes the corgi transformation virus
 2015-06-21 10:39:02 -05:00
Jordie0608 cc8467972c stat checks for update_icon 2015-06-21 21:31:14 +10:00