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

6667 Commits

Author SHA1 Message Date
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
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
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
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
Cheridan e1b7477857 Merge pull request #16579 from KorPhaeron/buffs_ignore 
Ignore Buffs
 2016-04-03 18:39:29 -05:00
Nerd Lord aa4a46e9de I'm awful at this sort of math! 2016-04-03 19:34:55 -04:00
Nerd Lord 89c9e6a3d3 flash 2016-04-03 19:01:38 -04:00
Nerd Lord 1f191b07ec visible memessage 2016-04-03 18:41:57 -04:00
Nerd Lord e6abb95178 Holoparasite balance 2016-04-03 18:33:20 -04:00
c0 2b3f4394c7 Adds on_species_gain proc to human species 2016-04-03 15:39:55 +03:00
Remie Richards 065d6c2851 fixes leftover logic from a previous build. 2016-04-03 00:06:49 +01:00
Remie Richards a3dd455a37 Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg 2016-04-02 20:52:00 +01:00
KorPhaeron 69f9549a11 Ignore Buffs 2016-04-02 10:59:59 -05:00
Nerd Lord 1467d0d6f1 slowmover 2016-04-02 11:28:43 -04:00
Nerd Lord 97508e9f33 now has a flash when hit in protection mode 2016-04-02 01:06:26 -04:00
Nerd Lord e26aa0636c the explosion glances off the protector's energy shielding 2016-04-01 18:37:16 -04:00
Nerd Lord a8737209a0 a var, a var, i need to make this a var 2016-04-01 16:13:48 -04:00
Nerd Lord 42a29a8eb6 Adds protector holoparasites 2016-04-01 16:09:54 -04:00
Isratosh 75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
Joan Lung 82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
KorPhaeron 2be10e302f Uses temp overlays for material scanners 2016-03-31 17:15:06 -05:00
KorPhaeron f2d5345093 Mesons 2016-03-31 17:02:50 -05:00
duncathan salt 1d32467096 Merge pull request #16496 from ChangelingRain/edgecases 
Fixes edge case where it was possible to get multiple parasites without admin intervention
 2016-03-31 12:20:41 -06:00
KorPhaeron 40023cf843 Merge pull request #16495 from ChangelingRain/dazedzinnia 
Daisy and Zinnia holoparasites no longer try to kill your eyes
 2016-03-31 11:40:15 -05:00
duncathan salt 1ff5882696 Merge pull request #16473 from KorPhaeron/goliath_meat 
Goliath changes
 2016-03-31 00:35:13 -06: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
KorPhaeron 507b48f8a3 Merge pull request #16476 from ChangelingRain/charrrrrrge 
Adds charger holoparasites to traitor
 2016-03-30 21:39:29 -05:00
Remie Richards 20597d0079 Merge pull request #16164 from Robustin/classiczombies 
Make zombies 2spooky
 2016-03-30 16:03:48 +01:00
Nerd Lord 323ccce61b Fixes edge case where it was possible to get multiple parasites without admin intervention 2016-03-30 10:08:29 -04:00
Nerd Lord 6db538ef77 Daisy and Zinnia holoparasites no longer try to kill your eyes 2016-03-30 10:00:22 -04:00
KorPhaeron e6c52aa5b3 Merge pull request #16468 from PKPenguin321/patch-16 
Scales back grab nerf
 2016-03-30 02:27:59 -05:00