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

1381 Commits

Author SHA1 Message Date
Jordie 475fce8da1 Merge pull request #8639 from Incoming5643/its_time_to_get_hard 
Traitors can now buy blood-red hardsuits for 8 TC
 2015-04-02 20:24:14 +11:00
ACCount12 f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan 6abe8e4f3a Merge pull request #8620 from phil235/RuntimeMutationFix 
Runtime mutation fix
 2015-03-31 00:11:00 -05:00
Incoming 58687cbbd3 Forgot to actually set the path, WHOOPS 2015-03-30 16:28:08 -04:00
Incoming 0b0ea5d9c2 traitors can now buy bloodred hardsuits for 8 TC (normal suits remain 5 TC) 2015-03-30 16:11:53 -04:00
phil235 85ed447129 Fix goon mutations not being initialized somehow... 2015-03-29 22:23:19 +02:00
phil235 c2dec1e970 Fixes runtimes linked to acquiring and losing mutations . 
Moves goon mutations to mutations.dm .
 2015-03-29 17:11:42 +02:00
Jordie eb5c73500a Merge pull request #8524 from AnturK/bzzt 
Adds Lightning Bolt spell
 2015-03-30 01:21:19 +11:00
phil235 a127c9403a Merge pull request #8553 from GunHog/Helmet_Fix 
Fixes #8541
 2015-03-28 23:35:19 +01:00
AnturK d376456402 - Adds simple charging visual 
- Adds sound effect
- Changelog
 2015-03-26 22:53:41 +01:00
GunHog 7b89713816 Fixes 8558 
- Helmet crates now come with the proper helmet type.
 2015-03-26 15:28:58 -05:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
AnturK 6fef7fefea - adds LoS obstacle check 
- some sanity checks
- Removes the blowback, now the spell just fizzles harmlessly
 2015-03-25 21:44:19 +01:00
Jordie 9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah 
Foam force fuck yeah!
 2015-03-25 16:30:42 +11:00
AnturK c7a93d2e6e Adds Lightning Bolt spell 2015-03-24 22:15:22 +01:00
hornygranny 14fa16078f Merge pull request #8368 from Cheridan/day1 
Spring Event Day 1: Martyr Objective!
 2015-03-23 17:15:55 -07:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
Fayrik 117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Cheridan e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Swag McYolosteinen e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants 
Cyber Implants Addendum
 2015-03-21 13:38:27 +01:00
xxalpha 29e441f3ad Finished changing permanent_sight_flags. 2015-03-21 12:28:25 +00:00
Swag McYolosteinen afa1b76cde Merge pull request #8190 from xxalpha/cyberimplants 
Cybernetic Implants
 2015-03-21 13:19:26 +01:00
Remie Richards 819422bc3e Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay 
MIAUW VON SAYCODE 3: RISE OF THE SPANS
 2015-03-21 05:05:37 +00:00
Fayrik 57f544ffdf Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff. 2015-03-20 23:19:04 +00:00
Fayrik b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
Swag McYolosteinen fd1b1f95b0 Merge pull request #8398 from MrPerson/red_herring_telecomms_equipment 
Fix nuke-op shuttle gets infinitely hot issue
 2015-03-20 17:44:30 +01:00
Cheridan 7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
xxalpha 31de411a11 Merge remote-tracking branch 'upstream/master' into cyberimplants 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/mob_defines.dm
 2015-03-18 20:11:51 +00:00
Miauw 1b753dd1c5 Adds the comic sans span to the new system. 2015-03-18 21:09:36 +01:00
MrPerson a9ed716853 Fix nuke-op shuttle gets infinitely hot issue 
Cause was faulty logic in datum/gas_mixture/mimic() that was leaking a null value into some multiplication math. It's still wrong, but at least it keeps the air too cold instead of making it literally infinitely hot.
Fixes #7691
Fixes #4740
Fixes #8166
 2015-03-17 14:53:12 -07:00
Jordie0608 f0731d01e2 changelog compiled 2015-03-17 20:03:31 +11:00
Cheridan 2ca9e8e392 Spring Event Day 1: Martyr Objective! 2015-03-15 22:50:25 -05:00
phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger 
Conflicts:
	code/modules/events/ninja.dm
 2015-03-15 12:30:27 +01:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan e5428c1519 Merge pull request #8256 from phil235/StrangenessTextFix 
Strangeness text, janicart, alien nest, weak golem fixes
 2015-03-13 15:23:30 -05:00
MrPerson 9038fb15af Code cleanup 
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
 2015-03-13 10:41:00 -07:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility." 
Changes two "for... show_message()" into "visible_message()".
 2015-03-12 23:15:54 +01:00
phil235 51e3bef054 Merge pull request #8294 from norill/mutfix 
acquiring negative mutations shows in red in chat
 2015-03-12 20:11:28 +01:00
norill 5ef5c5444d acquiring negative mutations shows in red in chat 2015-03-11 17:11:35 +01:00
xxalpha 0f01378e7a Reworked suggested code, added brain implants, misc additions. 
Fix missing ')'.

DELETE THIS
 2015-03-09 20:39:09 +00:00
phil235 8a1a5ff832 Fixes Strangeness mutation gain text not appearing. 2015-03-09 16:49:31 +01:00
Cheridan e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack! 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
 2015-03-09 01:47:40 -05:00
xxalpha fc81daee07 Added Thermals and emp_act(). Tweaked some related code. 2015-03-08 20:19:02 +00:00
xxalpha b1e340b19b Added X-ray implant, implant icon, touched up surgery. 2015-03-08 17:25:05 +00:00
hornygranny d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops 
Nuke Op Loot Pinata Tweaks
 2015-03-06 11:48:07 -08:00
xxalpha f0c3c9af07 Merge remote-tracking branch 'upstream/master' into cyberimplants 2015-03-06 18:52:25 +00:00