coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,366 Commits 9 Branches 11 Tags
0c5151a09ecefbd93d2e40b7b979a3be72425e77
Commit Graph

7338 Commits

Author SHA1 Message Date
oranges aed000580c Keep pixely layout when changing sign type 
This stops signs realigning to your turf when you go to change the sign
type.

Also slight sanity check for adjacency after user uses pen
 2016-04-06 14:02:47 +12:00
Cheridan b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone 
Gives the clown a megaphone.
 2016-04-05 15:35:36 -05:00
AnturK 3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183 
Better sleep()s for procs that abuse it
 2016-04-05 21:03:30 +02:00
MrStonedOne 5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
AnturK abe689cac9 Merge pull request #16587 from xxalpha/cigbrand 
Cigarette packs will brand their cigarettes.
 2016-04-05 19:59:09 +02:00
Cheridan 90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan 663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
KorPhaeron a6cd496c95 Merge pull request #16521 from erwgd/StorageEnhance 
Exosuit and utility belt enhancements, holster description change
 2016-04-04 20:57:03 -05:00
KorPhaeron 9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00
Cheridan 591aacfcc5 Merge pull request #16527 from ChangelingRain/thisiskorsfault 
Fixes minerals not spreading
 2016-04-04 18:20:21 -05:00
Cheridan d5a0f12ae3 Merge pull request #16438 from Bawhoppen/imrunningoutofnamesforbranches 
A few new maint lootspawner additions
 2016-04-04 18:02:57 -05:00
Cheridan b271395b06 Merge pull request #16573 from bgobandit/carrotrobustness 
Minor knife changes.
 2016-04-04 17:47:09 -05:00
Cheridan 866c418f78 Merge pull request #16592 from bgobandit/ocd 
Alt-clicking a fire extinguisher cabinet opens/closes it.
 2016-04-04 17:43:37 -05:00
Nerd Lord d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
KorPhaeron 01daa04d69 Outdoors check 2016-04-04 04:15:04 -05:00
KorPhaeron 0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
duncathan 497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Cheridan cf4ffc2781 Merge pull request #16026 from duncathan/turfs 
[REVIEW-READY] removes simulated turfs (and asteroid station)
 2016-04-04 01:49:45 -05:00
bgobandit dc9c725e41 Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt. 2016-04-04 02:13:33 -04:00
KorPhaeron 4a43bdbfda Merge pull request #16589 from psykzz/patch-1 
Suicide messages
 2016-04-03 22:01:30 -05:00
PKPenguin321 d098b2594f you cant hide from me you little shit 2016-04-03 18:57:32 -07:00
PKPenguin321 dbcb729f2a fixes a godawful message 
jesus christ who wrote this garbage
 2016-04-03 18:56:14 -07:00
duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
bgobandit 6e52bef680 Alt-clicking a fire extinguisher cabinet opens/closes it. 2016-04-03 07:11:53 -04:00
bgobandit 73bb67a1ea typo 2016-04-03 07:02:59 -04:00
xxalpha d6301ff735 Cigarette packs will brand their cigarettes. 
an

the macros dont work
 2016-04-03 10:42:53 +01:00
bawhoppen af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Joan Lung c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets 
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
 2016-04-03 13:41:45 +10:00
Matt Smith 70040af586 Suicide messages 2016-04-03 01:51:46 +01:00
bgobandit 5e3727a85f Minor knife changes. 2016-04-02 03:40:26 -04:00
KorPhaeron efe5ec8dbc Merge pull request #16500 from erwgd/SpearIntoLathe 
Cable restraints and spears can be recycled in autolathe, but not zipties
 2016-04-01 20:47:16 -05:00
Nerd Lord 7d5dce7e10 this, on the other hand, is byond's fault 2016-04-01 20:10:07 -04:00
Joan Lung 82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
duncathan salt 0f04ea79a0 Merge pull request #16401 from Tytynguyen/atmosrounding 
Atmospheric readings are now accurate to 0.01%
 2016-03-31 12:04:48 -06:00
duncathan salt f5b7a6cd0c Merge pull request #16493 from Isratosh/explosionlogs 
Adding an admin jump href to explosion logs
 2016-03-31 11:49:06 -06:00
erwgd 2c7fda0148 removed a redundant carried in shoulder holster desc 2016-03-31 13:07:47 +01:00
erwgd 5c90078c5b Lets you carry gloves in tool, sec, med and jani belts, bounced radios in tool, sec and med, edited shoulder holster description, let you carry handheld crew monitor in labcoats 2016-03-31 12:19:15 +01:00
KorPhaeron 03216dce2e Merge pull request #16465 from TehZombehz/foodbox 
Adds random ingredient food packages to chefs
 2016-03-31 04:03:09 -05:00
TehZombehz 6fb6da13a7 One line change 2016-03-31 03:54:02 -05:00
TehZombehz 229a90ba10 Reorganized for standards 2016-03-31 02:53:52 -05:00
Cheridan 97877c0b2f Merge pull request #16487 from Supermichael777/BZZZZT 
Makes Grills ZAP things when shit gets tossed at them.
 2016-03-31 01:42:58 -05:00
duncathan salt 3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery 
Slot icons micro-refactor
 2016-03-30 23:30:06 -06:00
duncathan eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
 2016-03-30 22:55:00 -06:00
TehZombehz 0f26065c64 HOPEFULLY removes conflicts 
First attempt ev
 2016-03-30 17:12:55 -05:00
erwgd 9f3694ba40 Changed materials of wired rod to account for cable restraints 2016-03-30 22:22:06 +01:00
erwgd d50cc41180 Gave cablecuffs and spear materials list, removed materials from zipties 2016-03-30 22:02:12 +01:00
KorPhaeron b388e76f9c Knives and thermal protection 2016-03-30 13:28:38 -05:00
Isratosh 11e20a42ca Adding an admin jump href to explosion logs 2016-03-30 04:19:08 -06:00
KorPhaeron e3dcebc65e Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2 
# Conflicts:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2016-03-30 02:12:20 -05:00
Supermichael777 b525ae0273 I cannot into code too deep 2016-03-30 00:14:14 -04:00