coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,238 Commits 9 Branches 11 Tags
f4e021fc82f2b9270892b7ab30eea2269fb2beca
Commit Graph

4241 Commits

Author SHA1 Message Date
Cheridan 793243763d Merge pull request #7185 from paprka/inhandrefactor 
Inhand refactor
 2015-01-20 22:16:06 -06:00
Cheridan 8f98597490 Merge pull request #7049 from RemieRichards/PipesAndBuckles 
Buckling Refactor + HE Pipe heat based colour
 2015-01-20 20:07:18 -06:00
tkdrg d97e01e0db Merge pull request #7120 from Menshin/clusterbangs_fix 
Made clusterbangs functionals
 2015-01-20 21:00:52 -03:00
phil235 f4ed29551b Merge pull request #7204 from Deantwo/NoCommentPDA 
Blank PDA Messages Fix
 2015-01-20 21:21:18 +01:00
Swag McYolosteinen e979bc95b1 Merge pull request #7150 from paprka/shoulderholster 
Adds shoulder holster for the detective
 2015-01-20 17:59:25 +01:00
Swag McYolosteinen 48d032bd88 Merge pull request #7146 from paprka/wcoatr 
Tones down winter coat spawning, removes santa hat spawns
 2015-01-20 17:57:24 +01:00
Swag McYolosteinen 63cb7dad4a Merge pull request #7145 from paprka/gunsicons 
splits gun.dmi up into multiple files
 2015-01-20 17:56:41 +01:00
tkdrg a9160e52dc Merge pull request #7105 from Carn/#6993 
Resolves #6993 - Moved pai controller into a subsystem.
 2015-01-19 20:17:14 -03:00
Deantwo 2a78daa8b5 Blank PDA Messages Fix 
- Added "if (!t) return" after msg_input is called. So no blank
messages.
 2015-01-19 20:10:21 +01:00
Remie Richards 96ac837b65 Merge pull request #6960 from Iamgoofball/goonetics 
Added 2 new powers and 9 new disabilities from goon and /vg/!
 2015-01-19 17:47:33 +00:00
paprka f58096575c refactors guns 2015-01-18 23:28:24 -08:00
paprka 2706be1190 optimizations to the way inhand files are found 2015-01-18 21:14:47 -08:00
paprka 88230fabfa inhand refactor 2015-01-18 20:58:31 -08:00
Iamgoofball b64efc6b54 Adds 3 new disabilities 2015-01-17 18:55:41 -08:00
paprka f797b04e15 adds shoulder holster for the detective 2015-01-17 17:11:38 -08:00
paprka ae21c54774 rip reindeer horns 2015-01-17 15:43:39 -08:00
paprka b83e6d9da4 winter coat removals 2015-01-17 15:39:50 -08:00
paprka 1b6831dab1 splits gun.dmi up into multiple files 2015-01-17 15:34:30 -08:00
tkdrg 059d8cf650 Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention 
Some disposals cleaning/stacking fix
 2015-01-17 17:16:52 -03:00
phil235 8a61d11e2e Merge pull request #7069 from Firecage/table_deconstruction_fix 
Fixes amount of materials gotten from deconstructing tables
 2015-01-17 19:57:49 +01:00
Iamgoofball bc9d48fa42 Mutadone and Mannitol, tweaks and changes. 2015-01-16 19:28:13 -08:00
Iamgoofball 35cc6e3c54 Replaces pathing. 2015-01-16 18:21:01 -08:00
Iamgoofball 38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
Remie Richards c08e4e4332 Merge pull request #7084 from JJRcop/ChronOPS 
Adds Chronosuit and T.E.D
 2015-01-17 01:02:52 +00:00
Sawu 87881ffb94 Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-17 09:55:12 +11:00
Menshin 309f8ca1b0 Made clusterbangs functionals again. 
General code cleanup.
 2015-01-16 22:29:17 +01:00
tkdrg ac3c413f24 Merge pull request #6969 from Firecage/Biogenerator_stuff 
Adds stuff to Biogenerator. STUFF!.
 2015-01-16 17:31:25 -03:00
JJRcop 8fecbe2318 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS 
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/projectiles.dmi
 2015-01-16 14:09:07 -05:00
Swag McYolosteinen 0ebd227f71 Merge pull request #7034 from paprka/nosenseofrightandwrongiguess 
Crossbow, speargun, and grenade updates
 2015-01-16 16:43:50 +01:00
Firecage dc602f9d57 Indentation fix. How did that single space instead of the tab worl anyway... 2015-01-16 15:38:31 +02:00
phil235 018b7379b4 Merge pull request #7088 from Firecage/tele_window_knocking_delay 
Simply adds a delay to knocking in windows with TK.
 2015-01-16 13:59:39 +01:00
paprka eae84c1c39 further conflicts and bugfixes 2015-01-15 21:59:36 -08:00
paprka ab7d50c90e Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
 2015-01-15 21:56:23 -08:00
Cheridan 63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
carnie a44795a699 Resolves #6993 - Moved pai controller into a subsystem. 2015-01-15 23:50:46 +00:00
Cheridan 5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
Menshin 8d1ebf3ad1 * Prevent stacking of dense disposal constructs (bin, outlet, chute) 
* Some general code cleaning (less snowflaking)
 2015-01-15 20:05:15 +01:00
JJRcop 31ebd43b18 Fixes issues with the chronosuit and TED. 
Removes unneeded vars from TED.
Re-adjusts armor values for chronosuit
 2015-01-15 13:32:21 -05:00
Swag McYolosteinen 2082baa64b Merge pull request #7042 from phil235/AudibleMessageRuntimeFix 
Fixes some runtimes from audible_message proc.
 2015-01-15 19:14:31 +01:00
Firecage 7fdd0556bb Updates to table/table frame deconstruction 2015-01-15 17:55:51 +02:00
Firecage f40d799e34 Simply adds a delay to knocking in windows with TK. 2015-01-15 11:49:38 +02:00
JJRcop f34afaa3c9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS 
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi
 2015-01-15 02:30:31 -05:00
JJRcop 4c8f890f88 Adds Timeline Eradication Device 2015-01-15 02:18:04 -05:00
Firecage 62ddab926f Fixes amount of mineral gotten from deconstructing tables 2015-01-15 03:31:56 +02:00
pudl d6d02cb142 Merge branch 'master' of https://github.com/tgstation/-tg-station into eff3shit 2015-01-14 14:54:22 -06:00
Remie Richards 14d01ca35d Commits the Buckling.dm file, required for this to work, I am silly. 2015-01-14 19:16:26 +00:00
Remie Richards 17654037db Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat. 2015-01-14 19:07:18 +00:00
phil235 884e2a6f73 Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message. 2015-01-14 18:00:17 +01:00
Sawu 0de72483bc Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-14 18:35:29 +11:00