coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,179 Commits 9 Branches 11 Tags
94de5c997e3f8155b981be4ac6b5e19bf59ebd80
Commit Graph

426 Commits

Author SHA1 Message Date
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive 
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
 2015-03-21 09:54:11 +03:00
Iamgoofball 7114d5ac04 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm
 2015-03-14 20:00:35 -07:00
CandyClownTG 87f0f44112 Update fancy.dm 
Replaced Doctor's Delight with Omnizine to make Syndicate Smokes useful again.
 2015-03-14 21:20:33 -04:00
Cheridan 3b89c07cd3 Merge pull request #8259 from phil235/BibleBookBagBug 
Fixes book bags not being able to hold bibles and looking like backpacks
 2015-03-13 12:51:10 -05:00
Remie Richards 751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
phil235 4f6c96235b Fixes book bags not being able to hold bibles. 
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
 2015-03-09 21:13:01 +01:00
Iamgoofball e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
 2015-03-08 14:26:52 -07:00
Cheridan 95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Xhuis 2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
phil235 d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-03-02 13:45:15 +01:00
Iamgoofball 01b733b2a2 changes and tweaks 2015-02-28 22:13:11 -08:00
Iamgoofball b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
TheVekter b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06:00
TheVekter abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
hornygranny c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
phil235 bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Razharas 55208e408d Merge pull request #7419 from paprka/beltoveray 
adds a simple overlay system for belts
 2015-02-20 07:06:20 +03:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
Cheridan 65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
xxalpha 1b24461841 Fix syndicate briefcase not having cash. 
Fix returns, fix everything.
 2015-02-09 18:06:20 +00:00
paprka 3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
paprka c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2015-02-05 17:44:22 -08:00
paprka 2ef8848c74 adds ability to store ammo and any type of revolver in holster 2015-02-05 17:41:10 -08:00
paprka 0645d46168 iv drip hotfixes 2015-02-03 18:34:32 -08:00
Cheridan 5f884b6017 Merge pull request #7496 from dannno/killyoselfmyman 
Adds proper suicide messages to like a lot of stuff
 2015-02-03 16:43:09 -06:00
Cheridan 80913f143b Merge pull request #7239 from paprka/ointmentandshit 
BLOOD FOR THE BLOOD GOD
 2015-02-03 16:30:42 -06:00
paprka 6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 
Conflicts:
	_maps/map_files/generic/z2.dmm
 2015-02-02 19:13:49 -08:00
dannno d8823a8038 Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman 2015-02-02 19:30:24 -05:00
dannno c18f485b17 fix shit, make bible suicide sacrifice you to your deity 2015-02-02 15:13:17 -05:00
Swag McYolosteinen 9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage 
Repath all non jetpack tank types to tank/internals
 2015-02-02 18:52:51 +01:00
paprka 18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
Cheridan f8bb02d54a Merge pull request #7422 from Steelpoint/ERTBalance2 
ERT Balance Pass 2 | ERT Access and Foam
 2015-02-01 20:16:04 -06:00
dannno c48bf44a47 framework for a future "suicide hotline" job 2015-02-01 19:44:54 -05:00
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
paprka 1ce5722eac map conflicts and other changes 2015-01-31 23:14:12 -08:00
paprka a661e58281 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-31 22:03:00 -08:00
dannno d47f6334c3 fixes dufflebag max weight class 2015-01-29 16:05:33 -05:00
Swag McYolosteinen 3bb7213d14 Merge pull request #7346 from paprka/hoodshit 
New hood/hardsuit helmet system
 2015-01-29 18:57:25 +01:00
Steelpoint 18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
paprka 9bece71e1d adds a simple overlay system for belts 2015-01-28 20:27:44 -08:00
Cheridan 46f588b424 Merge pull request #7334 from Xhuis/portable_console_in_belt 
Lets you store handheld crew monitors in medical belts
 2015-01-28 09:41:04 -06:00
Cheridan 1c81aa37a9 Merge pull request #7330 from Menshin/variables_clusterbangs 
Ported the variable payload clusterbangs from sayustation
 2015-01-28 09:25:50 -06:00
paprka c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
paprka a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00
Xhuis 87dc5bafdd Fixes error 2015-01-24 17:00:56 -05:00
Xhuis 266acdaac5 Lets you store handheld monitors on medbelts 2015-01-24 16:48:27 -05:00
Swag McYolosteinen 50e927ea33 Merge pull request #7314 from paprka/holster 
fixes holster weight class
 2015-01-24 16:48:05 +01:00