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

7166 Commits

Author SHA1 Message Date
tkdrg 63f49ab04b Adds maid and janimaid uniforms 
These two are available from the autodrobe.
Sprites by Nienhaus.
 2014-12-17 14:03:43 -03:00
paprka 4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
AnturK e573f02acc Check trimming 2014-12-17 14:36:49 +01:00
Razharas 82654b579a Merge pull request #6395 from Steelpoint/master 
Security Beret + Jumpsuit Sprites
 2014-12-17 13:53:45 +03:00
paprka 93166940f7 fixes singulo bombing 2014-12-17 02:25:33 -08:00
paprka 32f2028df1 Forgot to commit the locker changes 2014-12-16 22:38:51 -08:00
paprka 3fb065cd29 improves telebaton and police baton 2014-12-16 22:33:09 -08:00
paprka ef189dc9d4 adds dirt overlays for walking on turfs 2014-12-16 22:12:14 -08:00
paprka f0d80d487d adds EMT caps 2014-12-16 21:04:27 -08:00
phil235 d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Cheridan fd7d6f733f Merge pull request #6053 from phil235/LightMatchFix 
Fixing not being able to light a cigarette in someone's mouth with a lit match
 2014-12-16 12:40:49 -06:00
Cheridan 79af296b6d Merge pull request #6366 from phil235/ChairSpinningFix 
Fixes not being able to rotate your chair while buckled to it.
 2014-12-16 12:27:35 -06:00
Swag McYolosteinen 2cbcda1a5f Merge pull request #5702 from Donkie/traylayer 
Morgue/Crematorium update
 2014-12-16 14:27:49 +01:00
paprka 9b050ff010 removes meta protection from binary translator key 2014-12-16 00:37:54 -08:00
Steelpoint fb5eeb4265 HoP/BartenderArmor 2014-12-16 15:35:49 +08:00
Hornygranny bb273c5034 path fixes 2014-12-15 18:40:50 -08:00
Hornygranny e91796d59c proper sound changes 2014-12-15 18:36:19 -08:00
Hornygranny 7288f865fe undoes tortoisegit merge fuckery 2014-12-15 18:23:50 -08:00
Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 
Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt
 2014-12-15 18:12:14 -08:00
hornygranny 881fd8eaee Merge pull request #6223 from Ergovisavi/back_slot_toggle_items_fixes 
Fixing issues and updating equip method for Watertank Backpack / Defib
 2014-12-15 16:24:58 -08:00
hornygranny a1f263ec67 Merge pull request #6364 from phil235/DefibMessageColorFix 
Changes defibrillator success/failure messages color
 2014-12-15 16:18:42 -08:00
Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
 2014-12-16 02:52:08 +03:00
paprka feeb650701 Removes useless standard encryption keys from headsets 2014-12-15 14:59:19 -08:00
hornygranny 56ddfc1367 Merge pull request #6331 from tkdrg/weews 
Fixes disappearing alien weeds overlays
 2014-12-15 14:24:25 -08:00
Razharas d5d7b7f4d7 Fix of c4 not deleting on signaler explosions 
Fixes #6393
 2014-12-16 00:47:09 +03:00
phil235 4f026fc324 Fixes the welder's onmob sprite not updating when turning off due to lack of fuel. Fixing experimental weldingtool having an invisible sprite. 2014-12-15 16:45:10 +01:00
Steelpoint 4b9a87a808 MoveBeretsToSecureLocker 2014-12-15 19:46:32 +08:00
Cheridan 024817b0b2 Merge pull request #6154 from phil235/ClosetResistFix 
Fixes not being able to get out of a wrapped closet by resisting
 2014-12-15 02:53:33 -06:00
Cheridan b143e41b88 Merge pull request #6265 from Miauw62/HOHOHO 
SANTA IS COMING TO STATION
 2014-12-14 23:58:28 -06:00
paprka 1fd9e6bfda Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/obj/gun.dmi
 2014-12-14 21:55:28 -08:00
Cheridan f9eacb4498 Merge pull request #5854 from A4Brogan/Ghetto_Banana_Lamp 
Ghetto Banana Lamp
 2014-12-14 23:51:18 -06:00
Cheridan 7491cc38f7 Merge pull request #6346 from TZK13/Chemical-Closet-Sprites 
Adds distinct sprites for the chemical closet
 2014-12-14 23:21:04 -06:00
paprka e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
KyrahAbattoir fd550c82ff Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector. 2014-12-15 00:08:03 +01:00
phil235 61c8d6ab33 Fixes not being able to rotate your chair while buckled to it. 2014-12-14 18:11:49 +01:00
phil235 027ce2a1df Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure. 2014-12-14 17:32:03 +01:00
tkdrg b983176937 Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-14 11:59:45 -03:00
AnturK a1f3a51dab Adds Librarian PDA cartridge 2014-12-14 13:59:35 +01:00
Daniel Hultgren 5071d307b0 Can now click switch with any object 2014-12-14 12:22:15 +01:00
Razharas 0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
paprka 303564638b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	code/game/jobs/job/security.dm
 2014-12-13 22:58:22 -08:00
paprka db6eabfc4e intial commit for syndicate hardsuit feature 2014-12-13 22:26:09 -08:00
Razharas 21a2c2d21e Made clumsiness into disability 
I really dont want to make clumsy_act()
 2014-12-14 08:04:48 +03:00
Razharas bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8 
Security aesthetic overhaul
 2014-12-14 07:57:33 +03:00
TZK13 0df50e5c6e Adds distinct sprites for the chemical closet. 2014-12-13 22:04:43 -06:00
Razharas 44cc6c6d97 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-14 03:07:13 +03:00
Daniel 536c0b55a5 Morgue update 2014-12-13 12:42:49 +01:00
paprka 3bd3175a18 Removed unused armbands 2014-12-13 00:14:03 -08:00
paprka 40943d5684 reverts some sechailer and other feature things 2014-12-13 00:09:58 -08:00
Cheridan c104ad6cd4 Merge pull request #6323 from AndroidSFV/fix6313 
Fixes 6313
 2014-12-12 23:01:43 -06:00