coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

14295 Commits

Author SHA1 Message Date
KorPhaeron e0157185fc Blacklist 2015-12-30 10:10:54 -06:00
TheRealGLH 9cb962cbc1 removes argument that did not need to be specified 2015-12-30 09:34:42 +01:00
duncathan 8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
tkdrg e57b43276d Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH! 
Fixes Abductor event
 2015-12-29 22:51:17 -03:00
TrustyGun a72a66cab2 Fixes literally everything 2015-12-29 19:47:39 -05:00
Melichior 53db2cbcd1 Fixed 'in' precedence errors. 2015-12-29 17:16:09 -07:00
TrustyGun d51a6d7969 Adds two new UI styles: Slimecore, and Operative 2015-12-29 16:52:21 -05:00
Razharas fd0738aff8 Merge pull request #14125 from KorPhaeron/gold_grub 
Gold grub fix
 2015-12-30 00:38:06 +03:00
Cheridan a40b732fe4 Merge pull request #13943 from tkdrg/abos 
Checking antagonists will now message admins
 2015-12-29 15:02:00 -06:00
Nerd Lord 7c8a138f60 Sneaks in a new book sprite that's totally white colored, no blue dot. 2015-12-29 16:01:14 -05:00
PKPenguin321 bdaf037434 fixes the force values and removes ".0"s 
thanks @jordie0608
pls let this be ready for merge
 2015-12-29 12:07:50 -08:00
oranges 06338ecd3d Add cockroach guts to cleanbot target list 
whitelists are such a meme
 2015-12-30 08:58:27 +13:00
duncathan salt 42d10a22d3 Merge pull request #13926 from Bawhoppen/czechmilitary 
Tactical Gear + small changes
 2015-12-29 20:43:14 +01:00
duncathan 17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
SouDescolado 548549409b Update jobs.dm 
/obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic
 2015-12-29 17:27:17 -02:00
SouDescolado 16f754502a Update armor.dm 
/obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic
 2015-12-29 17:26:14 -02:00
KorPhaeron 034842b901 Fixes tesla 2015-12-29 13:16:33 -06:00
KorPhaeron 9148b9ccd2 Bluespace shelter 2015-12-29 13:08:29 -06:00
KorPhaeron 4bdf1a882b Lizard hats 2015-12-29 13:01:13 -06:00
SouDescolado c38ca9fc92 Add telescopic baton item to detective armor 
Add telescopic baton item to detective armor
 2015-12-29 16:17:56 -02:00
SouDescolado ed6f41f6de Add telescopic baton item to detective trenchcoat 
Add telescopic baton item to detective trenchcoat
 2015-12-29 16:16:13 -02:00
Tkdrg 2a08622b7e Stealthmin Improvements 
Removes stealthmins from the orbit list and makes them invisible.
Remember to always use dsay instead of say to avoid the (F) links!
 2015-12-29 15:09:27 -03:00
tkdrg 5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor 
Refactor quick-equip verb
 2015-12-29 14:26:48 -03:00
KorPhaeron 9bcca100ca Lesser Summon Guns 2015-12-29 10:58:27 -06:00
Lo6a4evskiy 6080a8fa96 Fix buckets with liquid not quick equipping 2015-12-29 18:20:42 +04:00
Lo6a4evskiy ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
TheRealGLH d7097594ff removes the burn_skin proc 
removes the burn_skin proc
 2015-12-29 13:48:38 +01:00
Martijn Daniels a7865bd9cf electrocute_act 
Changes containment field and electric chair effects to use
electrocute_act
 2015-12-29 13:36:16 +01:00
Remie Richards ae2ef83fc6 Merge pull request #14062 from tkdrg/jesusFUCK 
[s]Fixes secbot construction dupe
 2015-12-29 07:06:19 +00:00
Remie Richards dcea576585 Merge pull request #14063 from tkdrg/you_are_now_breathing_manually 
Manual bans will now add notes automatically
 2015-12-29 07:05:53 +00:00
Remie Richards 7ae7fa0d88 Merge pull request #14113 from tkdrg/DUPES 
Adds a "dupe marked datum" option to Game Panel
 2015-12-29 07:04:14 +00:00
GunHog 834242b808 Fixes Abductor event 
18,0000 deciseconds = 300 minutes, not 30!
 2015-12-28 20:08:26 -06:00
tkdrg dc0c056fc9 Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns 
Summon Guns 2016
 2015-12-28 22:58:47 -03:00
Incoming b7ecdf6a2f Adds scatter lasers to the drop list 
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
 2015-12-28 20:47:32 -05:00
KorPhaeron 863c0c410f Adds follow links 2015-12-28 19:37:37 -06:00
AnturK 0fb8ac18c3 Adds a few special mines/pickups 2015-12-29 00:20:57 +01:00
tkdrg a3533519ea Merge pull request #13995 from KorPhaeron/tokiwotomare 
Timestop fixes
 2015-12-28 19:44:08 -03:00
tkdrg 2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework 
Simple Vehicle Framework
 2015-12-28 19:41:59 -03:00
Remie Richards db6f01bf5e Formalises Path Compatibility 2015-12-28 22:20:33 +00:00
KorPhaeron afdf68858d gold_grub 2015-12-28 15:48:38 -06:00
tkdrg 75df8a35e0 Merge pull request #14102 from KorPhaeron/foam 
Unrestricted foam force weapons for admin spawn
 2015-12-28 18:47:59 -03:00
tkdrg 7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin 
Random ruins for space/lavaland [ready for review]
 2015-12-28 18:40:13 -03:00
KorPhaeron 9cf6a315b7 Advanced Darkness 2015-12-28 15:25:42 -06:00
duncathan salt b943109a02 Merge pull request #13905 from KorPhaeron/weather 
Weather datums [WIP]
 2015-12-28 22:06:31 +01:00
duncathan salt 0aca78f381 Merge pull request #14100 from Anonus/blobberno 
Blobbernauts can no longer smash walls.
 2015-12-28 22:04:11 +01:00
AndrewJacksonThe2nd dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
 2015-12-28 12:40:51 -08:00
duncathan cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:59:16 -06:00
duncathan a64b68f76c caches gases in more procs 2015-12-28 13:32:49 -06:00
bgobandit cdd5be39be valentines are actually examinable honk 2015-12-28 13:52:34 -05:00
bgobandit caf002c4cf fixes travis, even more valentimes 2015-12-28 13:39:47 -05:00