coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,257 Commits 9 Branches 11 Tags
fb9f2a6bb583bcdfd4b4c9a294868eb83a366170
Commit Graph

17624 Commits

Author SHA1 Message Date
oranges 09e38702d2 Merge pull request #20266 from Iamgoofball/patch-121 
>there's already a global list named uplink items
 2016-09-05 08:48:43 +12:00
A-t48 4f40d955b1 Fix scrubbing freon\water vapor + fix labelling canisters with freon\water vapor (#20301) 
* Fix a bunch of atmos stuff

* undo whitespace fixes

* remove whitespace fixes
 2016-09-04 22:24:29 +02:00
Cheridan 5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear 
Bubblegum's charge now goes the full distance to the target
 2016-09-04 13:38:25 -05:00
Cheridan 40128ee502 Merge pull request #20292 from pubby/belt 
Tweak military belt TC cost from 3 -> 1
 2016-09-04 07:08:16 -05:00
Iamgoofball 82da7f1042 Removes chem gas leftovers (#20297) 
She, goof. She.
 2016-09-03 19:16:17 -04:00
MMMiracles 1b4318f1a2 Combat Bears (#20215) 
* adds bear

* bear armor dlc

* bear upgrades galore
 2016-09-04 09:51:03 +12:00
oranges ebcde4fe56 Merge pull request #20290 from ChangelingRain/feetdeepintheeartharmsdeepinthedusthandsonthemountainseyesinthesea 
Fixes some potential weird faction bugs
 2016-09-04 09:47:37 +12:00
oranges ffed997ea4 Merge pull request #20276 from KorPhaeron/dispenser 
Exploding water tanks now actually throw the water out
 2016-09-04 09:46:34 +12:00
oranges 240a6f2823 Merge pull request #20267 from ChangelingRain/justanothersteppingstonetothenextgreatmaniacrushofdesignjustanotherstoneinthevoid 
Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer
 2016-09-04 09:45:59 +12:00
oranges c34bcaa9ad Merge pull request #20264 from GunHog/Silicon_Ghost_Laws 
Ghosts may now examine silicons to read their laws.
 2016-09-04 09:45:33 +12:00
Cheridan a18142f681 Merge pull request #20289 from GunHog/Errorage_Is_Really_A_Nice_Guy 
Fixes and tweaks aux base stat logging
 2016-09-03 16:20:29 -05:00
Joan Lung 42acfb5571 range 2016-09-03 16:06:04 -04:00
Joan Lung c4ffc23499 rip position 2016-09-03 16:04:37 -04:00
Joan Lung 4813791163 non-random 2016-09-03 14:56:53 -04:00
Joan Lung 950851b5a7 it's comin at ya 2016-09-03 14:34:42 -04:00
Joan Lung 246c6cf5d6 'insert horrifying roar here' 2016-09-03 14:30:32 -04:00
Joan Lung 266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
pubby 109ad42a51 Tweak military belt TC cost from 3 -> 1 2016-09-02 18:16:28 -05:00
AndrewJacksonThe2nd 42dbcf2f89 abhzsaxbhgszabnxzhbjmnzshbjmzdsxbmh 2016-09-02 16:01:52 -07:00
AndrewJacksonThe2nd 8298331538 fixes 2016-09-02 15:57:15 -07:00
AndrewJacksonThe2nd 082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos 
Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm
 2016-09-02 15:51:26 -07:00
Joan Lung 32ef285db9 Merge pull request #20272 from Iamgoofball/patch-122 
Hacky freon fixes pending the rework
 2016-09-02 18:46:15 -04:00
AndrewJacksonThe2nd 0ada3764ae Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos 
Conflicts:
	tgui/assets/tgui.js
 2016-09-02 15:42:17 -07:00
AndrewJacksonThe2nd dfcdf5866e fixes 2016-09-02 15:37:14 -07:00
AndrewJacksonThe2nd 2953360310 Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION 2016-09-02 15:04:51 -07:00
Joan Lung 0f3031bd7e Fixes some potential weird faction bugs 2016-09-02 16:51:26 -04:00
GunHog 0575213666 Tweaks Aux Base Stat Logging 
Aux Mining Base stat logging actually works now, and includes the
coordinates where the base lands.
 2016-09-02 14:36:28 -05:00
A-t48 91bbdfee56 Fixed cyborgs being able to use Power Warning emote when broken. (#20249) 
* Fix #19905

* Slight cleanup
 2016-09-02 20:14:15 +12:00
KorPhaeron ae102fbc0e Missing ) 2016-09-02 01:56:13 -05:00
KorPhaeron 84539b1e79 Explosive water tanks 2016-09-01 22:55:02 -05:00
oranges 156a7f30e1 Merge pull request #20223 from PKPenguin321/patch-5 
Blacklists lattices from the tesla
 2016-09-02 14:12:35 +12:00
Iamgoofball bd1bb7c22a Update living_defines.dm 2016-09-01 18:06:47 -07:00
Iamgoofball b777e451ef Update living.dm 2016-09-01 18:06:15 -07:00
Joan Lung a6b3f3dc6e Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer 2016-09-01 18:45:36 -04:00
oranges aff8e48038 Merge pull request #20260 from Kromgar/revert-20186-InsertFix2 
Revert "Fixes issues with packagewrap, trashbag, handlabeler, "
 2016-09-02 09:39:30 +12:00
Shadowlight213 378821e975 Fixes pizza bombs and boxes not deleting correctly. (#20254) 
* Fixes pizza bomb not deleting correctly.

* return
 2016-09-01 15:47:52 -05:00
Iamgoofball f3de290b00 >there's already a global list named uplink items 
this should fix the memes
 2016-09-01 13:45:56 -07:00
GunHog ad66c15ac7 Ghosts may now examine silicons to read their laws! 
- Examining an AI or Cyborg as a ghost now displays its laws.
 2016-09-01 13:55:06 -05:00
Kromgar 2b235b8bba Revert "Fixes issues with packagewrap, trashbag, handlabeler, " 2016-09-01 12:18:24 -04:00
AnturK 7599074f44 Merge pull request #20216 from Cruix/food_stuff 
Fixed food recipe code
 2016-09-01 09:34:07 +02:00
AndrewJacksonThe2nd 15eac23ac3 CHEMICAL GAS & Reworks 2016-08-31 19:35:39 -07:00
oranges 00495cedc5 Merge pull request #20186 from phil235/InsertFix2 
Fixes issues with packagewrap, trashbag, handlabeler,
 2016-09-01 10:13:30 +12:00
oranges 23915f99bb Merge pull request #20213 from KorPhaeron/water2 
Watertanks explode when shot
 2016-09-01 10:12:50 +12:00
oranges cf720194ae Merge pull request #20214 from Cruix/telekinetic_gaia_removal 
Fixed bug with adding ambrosia gaia to hydro trays.
 2016-09-01 10:12:08 +12:00
oranges b94aa6e07e Merge pull request #20049 from Iamgoofball/patch-112 
Fixes stock price spikes
 2016-09-01 09:11:30 +12:00
Leo 24534a07b9 Makes the admin bomb list a bit more useful (#20227) 
* Adds some stuff to bombing list

* More stuff

* Added IEDs, molotovs, pizzabombs, lemons and grenades to the bombing list.
 2016-08-31 14:03:31 +02:00
AndrewJacksonThe2nd 64643ee402 code memes 2016-08-30 23:37:12 -07:00
AndrewJacksonThe2nd f405ed6603 GOOFMOS: FREON REWORK and WATER VAPOR 2016-08-30 23:25:32 -07:00
KorPhaeron c98ef0bced Merge pull request #20221 from kevinz000/lava-the-staff 
Makes necropolis chests not burn up in lava
 2016-08-31 01:02:03 -05:00
oranges 2d46e7766d Since infinite traitor items is okay, I improved it (#20108) 
* Since infinite traitor items is okay, I improved it

* Update packs.dm

* Update packs.dm

* Update packs.dm
 2016-08-31 16:58:05 +12:00