coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,068 Commits 9 Branches 11 Tags
0976cde77381cdb42c38ee8a2d48f39d6a67bbbb
Commit Graph

3930 Commits

Author SHA1 Message Date
paprka 4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
Razharas 82654b579a Merge pull request #6395 from Steelpoint/master 
Security Beret + Jumpsuit Sprites
 2014-12-17 13:53:45 +03: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
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
hornygranny 56ddfc1367 Merge pull request #6331 from tkdrg/weews 
Fixes disappearing alien weeds overlays
 2014-12-15 14:24:25 -08: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
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
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
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
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
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
tkdrg 79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
paprka 868f29ada7 reverts armband change 2014-12-12 10:53:35 -08:00
tkdrg 621d3d936a Fixes disappearing alien weeds overlays 
I have no idea why this works.
Fixes #6326
 2014-12-12 14:29:32 -03:00
AndroidSFV 3a0927febd Fixes 6313 2014-12-12 11:16:54 -06:00
Hornygranny 98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/mecha/mech_fabricator.dm
 2014-12-11 13:53:37 -08:00
paprka 76f7765c7b lockers for boxes 2014-12-11 12:13:13 -08:00
paprka e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
Cheridan 27793609d8 Merge pull request #6201 from fleure/togglefix 
Fixes toggling watertank nozzle in hands with verb
 2014-12-11 12:21:32 -06:00
Cheridan 3ede77face Merge pull request #6189 from Menshin/exofab_revamp_end+fixes 
Exofab revamp finishing and fixes
 2014-12-11 11:52:16 -06:00
Cheridan 2619beccdf Merge pull request #6270 from optimumtact/iflashedu 
Fix flash messages when failing to flash
 2014-12-11 06:35:29 -06:00
Razharas f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening 
Guns: the gunnening
 2014-12-11 10:46:34 +03:00
hornygranny 7d83830365 Merge pull request #6268 from tkdrg/yum 
Changes weed overlay border layer to match weeds
 2014-12-10 16:55:13 -08:00
Cheridan ece2bb00c3 Merge pull request #6242 from Dorsisdwarf/RCDbuff 
Buffs the RCD
 2014-12-10 06:23:28 -06:00
Cuboos 8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
Hornygranny 99f364f480 makes APC call parent 2014-12-09 18:53:29 -08:00
Hornygranny f34fcd6124 overrides attack 2014-12-09 18:10:17 -08:00
Hornygranny 72132b1bf1 fixes whitespace 2014-12-09 16:32:16 -08:00
Hornygranny af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Cheridan d529235696 Merge pull request #6187 from phil235/GrilleWindowFix 
Fixes being able to place multiple fulltile window on a grille.
 2014-12-09 12:51:05 -06:00
Razharas 0b32dc97a7 Merge pull request #6136 from optimumtact/patch-3 
Grille throwforce is now halved against grilles, instead of -5
 2014-12-09 05:31:32 +03:00
oranges 41f0d0e04f Fix flash messages when failing to flash 
It would give the success message when flashing carbons even if the flash
had actually failed to work
 2014-12-09 09:38:26 +13:00