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

6702 Commits

Author SHA1 Message Date
PKPenguin321 3dd20078ae big update 
removes all counter/blocking related code and the related sound effect
makes krav maga use action buttons instead of verbs
renamed quick choke to lung punch
reduced stun time on leg sweep
removed head elbow, removed the help button (obsoleted by tooltips)
 2016-04-15 17:32:05 -07:00
PKPenguin321 c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
Joan Lung 28d543aa8b Merge pull request #16704 from Incoming5643/Its_3_am_and_I_am_too_dazed_to_make_a_clever_branch_name 
Tongues
 2016-04-11 19:44:36 -04:00
KorPhaeron 36b5122709 Merge pull request #16786 from TechnoAlchemisto/emote_fix 
Fixes a simple animal emote.
 2016-04-11 10:35:18 -05:00
Cheridan f650cf0e0d Merge pull request #16720 from RemieRichards/client_colour_handler 
Adds a priority system for client.color effects
 2016-04-10 13:06:22 -05:00
TechnoAlchemist a30b6a7502 fixes an emote. 2016-04-10 01:00:40 -07:00
Incoming 513d5b12dc Generalize the system down to carbon, adding a xeno tongue that handles the actual hissing sound. 
Moves the tongue organ to the mouth
Fixes up synth inheritances
Losing your tongue no longer makes you silent, but rather just makes you a lot harder to understand
Little misc things
 2016-04-09 21:55:44 -04:00
Joan Lung 0af8681bb7 Merge pull request #16724 from coiax/my-best-friend-is-a-holocarp 
My best friend is a holocarp
 2016-04-09 14:19:18 -04:00
coiax daecc5983b Revert "HERES YOUR CODE FIX SIR" 2016-04-09 19:10:26 +01:00
AnturK 86eee6605d Merge pull request #16478 from GunHog/WJ_Likes_To_Inspect_His_Xenos 
Xenomorph changes and features
 2016-04-09 12:23:20 +02:00
KazeEspada c6eaacac78 Refactors guardian code so that the name datums do everything. Makes it so that guardians can use an overlay system. 2016-04-09 00:29:36 -07:00
KorPhaeron 05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate 
You can no longer drop survival capsules on top of dense objects
 2016-04-08 13:36:29 -05:00
Cheridan 108eefb86c Merge pull request #16705 from Shadowlight213/adminghostruntime 
Fixes a runtime with IsAdminGhost
 2016-04-08 12:39:01 -05:00
Nerd Lord 5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
Jack Edge d8530c53f6 Added Jaws reference to assassin holocarp 2016-04-08 08:44:13 +01:00
Jack Edge 11da00d9b7 Fixed /choose not allowing you to choose 
I misunderstood its purpose. I have fixed it now.
 2016-04-08 08:38:50 +01:00
Jack Edge 6b64b5b71a Removed duplicated see invisible var 2016-04-08 08:20:16 +01:00
Jack Edge 501442cec8 Changed back to recent snare stuff 2016-04-08 08:19:24 +01:00
KorPhaeron 6d519c4e26 Merge pull request #16673 from PKPenguin321/fuck-you-goofball 
Reverts most of goof's grab nerf
 2016-04-08 02:05:21 -05:00
Nerd Lord 8caca4a78e mining mobs fire less often 2016-04-07 20:46:41 -04:00
Jack Edge aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp 
Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm
 2016-04-07 22:56:08 +01:00
Remie Richards 984afed89f Adds a priority system for client.color effects 2016-04-07 21:55:31 +01:00
Jack Edge 21b95b4794 New and improved holocarp sprites 
Adds the greyscale holocarp to the guardian.dmi and makes our
holocarp code use it.
 2016-04-07 21:41:15 +01:00
Incoming 8ca4bd4a84 Remie catching me on real coder hours 2016-04-07 03:33:42 -04:00
Shadowlight213 9e296ed32e Fixes a runtime with IsAdminGhost 2016-04-07 00:05:29 -07:00
Incoming b2b02887ec Tongues WIP 
Adds tongues, which serve as the physical manifestation of speech impediments.
 2016-04-07 02:59:23 -04:00
Remie Richards da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances 
Conflicts:
	code/game/atoms.dm
 2016-04-06 21:26:46 +01:00
Kyle Spier-Swenson 91d90c602f fixes trees fucking up atmos. 2016-04-06 12:37:54 -07:00
GunHog afbe7c0dcc Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-06 14:10:07 -05:00
AnturK 2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain 
Adds on_species_gain proc to human species
 2016-04-06 20:18:15 +02:00
Core0verload 4e9db5beac Slimes can now be put in stasis by CO2 2016-04-06 02:25:49 -06:00
Core0verload 04ce5e42cd World "?status" expansion, Topic() rework 
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
 2016-04-06 02:15:25 -06:00
PKPenguin321 272c7bb896 reverts most of goof's grab nerf 2016-04-05 17:19:10 -07:00
KorPhaeron 55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff 
Simple Animal ranged cooldowns now use world.time
 2016-04-05 18:45:48 -05: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 15e66ce517 Merge pull request #16630 from AnturK/gorilla_warfare 
Monkeys can now use all guns without restrictions.
 2016-04-05 11:24:58 -05:00
Nerd Lord e57492a77e Fixes support holo beacon teleportation not working under most conditions 2016-04-05 09:15:02 -04:00
Cheridan fa6655d18c Merge pull request #16604 from ChangelingRain/zombotron 
Zombies can no longer remove more than one airlock at once
 2016-04-04 23:29:09 -05:00
Nerd Lord 45628c7598 A VAR A VAR I NEED TO MAKE THIS A VAR 2016-04-04 20:01:05 -04:00
Nerd Lord 8038c4dd33 Simple Animal ranged cooldowns now use world.time 
this might fuck stuff up but ~oh well~
 2016-04-04 19:59:59 -04:00
Cheridan 2a4b304df8 Merge pull request #16601 from ChangelingRain/guardedbalance 
Holoparasite balance
 2016-04-04 18:38:31 -05:00
Cheridan 64c6143e22 Merge pull request #16551 from ChangelingRain/alwaysuseprotectors 
Adds protector holoparasites to traitor
 2016-04-04 18:22:30 -05:00
GunHog c33af31bf6 Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-04 11:56:07 -05:00
GunHog 3f0f57440a Phase 2 
- Fleshed out airlock forcing. Delay added to opening airlocks. Very
short if the airlock is unpowered, longer if it is powered.
- Added sexy new sound to airlock forcing.
- Xenos may now open firelocks.
- Xenos may now unweld scrubbers and vents.
- Xeno drones are now faster!
- Larvae now mature in half the time.
 2016-04-04 11:30:57 -05:00
AnturK b1f9fa649f Monkeys can now use all guns without restrictions. 2016-04-04 18:15:33 +02: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
KorPhaeron 135ceb2b64 Buffs OOC ban 
* Buffs OOC ban

* Buffs OOC ban
 2016-04-03 22:39:52 -05:00
Nerd Lord 0cabcdd673 Zombies can no longer remove more than one airlock at once 2016-04-03 20:34:18 -04: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