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

8815 Commits

Author SHA1 Message Date
phil235 6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes 
Recieve --> Receive
 2015-04-04 20:00:21 +02:00
Jordie 6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings 
Someone called for pest control?
 2015-04-04 20:58:07 +11:00
Jordie 3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus 
Cyber Implants +
 2015-04-04 20:57:48 +11:00
Jordie 13a6a51550 Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately 
Removes slowdown from Reactive Teleport Armor and increases activation chance
 2015-04-04 20:57:33 +11:00
Jordie 19af7bd19e Merge pull request #8570 from RemieRichards/FireSpread 
Fire spread on mob touch
 2015-04-04 20:56:58 +11:00
Jordie 7dbd8b1d02 Merge pull request #8706 from phil235/WeakenedFix 
Fixes weakened/stunned/paralysis not going down naturally for aliens.
 2015-04-04 20:56:32 +11:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix 
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
 2015-04-03 19:42:34 +03:00
Cheridan 0bd95eaa54 Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL" 2015-04-02 21:13:50 -05:00
phil235 e834781427 Fixes weakened/stunned/paralysis not going down naturally for aliens. 2015-04-02 23:25:08 +02:00
Jordie 4c1c55906f Merge pull request #8666 from phil235/AnimalsUpdatehealthFix 
Fixes simple_animals being immune to fire damage melee attacks.
 2015-04-02 20:16:18 +11:00
Jordie 57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
GunHog 89a8e8dea4 Fixes Reactive Teleport Armor 
- Makes the armor actually teleport again!
 2015-04-01 21:14:02 -05:00
GunHog c9e7d949e1 Buffs teleportation chance to 50 percent! 
- Also prepares the ritual sacrifice to the Eternal Jordie, God of
Changelogs.
 2015-04-01 20:49:42 -05:00
dannno 6e83015145 fixes critical priority bug 
jesus christ think of all those g's. jesus fucking christ. what have we done
 2015-04-01 21:49:14 -04:00
GunHog 1f85f785f8 Removes slowdown from Reactive Teleport Armor 2015-04-01 16:46:03 -05:00
hornygranny 35498dc200 Merge pull request #8686 from sawu-tg/npcpool 
Fixes to SNPCs
 2015-04-01 11:47:57 -07:00
Sawu 799eadb6c8 Fixes to SNPCs 
* Fixes two runtimes (stat menu and taking a delegate/assistant)
* Fixes SNPCs not being inserted into the NPCPool
* Makes the NPCPool fire more often for maximum robustness.
 2015-04-02 05:19:21 +11:00
Swag McYolosteinen e886207f58 Merge pull request #8684 from Cheridan/chem_farts 
AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL
 2015-04-01 18:29:25 +02:00
Cheridan 3ac4d299c9 Merge pull request #8657 from Jordie0608/thisdrillisalsobrokenbutforadifferentreason 
Reworks cyborg drill's power usage handling and fixes recharging
 2015-04-01 08:25:46 -05:00
Cheridan 053046c970 typo fix 2015-04-01 06:28:23 -05:00
Jordie 691411c76c Merge pull request #8648 from Cheridan/collared 
Fixes collar stuff
 2015-04-01 18:45:02 +11:00
Jordie 2484674261 Merge pull request #8651 from xxalpha/atmosuitfix 
Fixes atmos hardsuit pathing.
 2015-04-01 18:44:49 +11:00
Jordie 904b27dcd7 Merge pull request #8607 from Iamgoofball/fuck 
Fixes *flip
 2015-04-01 18:44:20 +11:00
Jordie b9753b8bb9 Merge pull request #8519 from dannno/WEEEOOOOWEEEEOOOO 
WEEEOOOO WEEEEOOO WEEEOOO
 2015-04-01 18:43:43 +11:00
Iamgoofball 86a1c9927a removes feedback msg, fixes checks 2015-03-31 20:13:09 -07:00
hornygranny 89fd1ba9c4 Merge pull request #8595 from ACCount12/dredd 
Firing pins update
 2015-03-31 16:34:35 -07:00
phil235 9261196b4f Fixes simple_animals being immune to fire damage melee attacks. 
Fixes slime being able to latch onto other slimes with mouse_drop (but not the feed verb)
 2015-03-31 21:29:34 +02:00
Swag McYolosteinen d8c588867a Merge pull request #8634 from sawu-tg/master 
See #7217
 2015-03-31 19:40:33 +02:00
dannno d1eb8fcaec Merge branch 'master' of https://github.com/tgstation/-tg-station into WEEEOOOOWEEEEOOOO 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-03-31 13:01:09 -04:00
Jordie0608 d2600d8ea2 whoops 2015-03-31 21:51:48 +11:00
Jordie0608 e70134a37a made warning function not really dumb 2015-03-31 21:49:07 +11:00
Jordie0608 879659a3d1 cyborg drills use internal battery first + charging fix 2015-03-31 21:24:48 +11:00
Jordie b62eb672da Merge pull request #8618 from Xhuis/my_ears_they_bleed 
Separates ship ambience and area ambience
 2015-03-31 19:16:59 +11:00
Jordie 2d94da8e59 Merge pull request #8592 from phil235/AlienAttackBlob 
Fixes alien humanoids not being able to attack blobs.
 2015-03-31 19:11:12 +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 67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing 
Fixes alien nest buckling
 2015-03-31 00:06:14 -05:00
xxalpha ccb4405de4 Fixes atmos hardsuit pathing. 2015-03-31 03:50:11 +01:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion 
Centcom Two: It's better now, I swear.
 2015-03-30 21:35:19 -05:00
Cheridan 3865495994 Fixes collar stuff 2015-03-30 18:22:25 -05:00
phil235 e88e8a4ed5 Fixes drowsyness never going down. 2015-03-31 00:27:32 +02:00
xxalpha c1bf12345e Added ability for Medical HUDs to detect cybernetic implants. 2015-03-30 17:52:08 +01:00
Sawu bfd0436324 See #7217 
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
 2015-03-31 02:26:05 +11:00
Cheridan caecd36d7c Merge pull request #8552 from Jordie0608/togetwiththetimesyouwillfirsthaveotfindthem 
Removes old player panel
 2015-03-30 09:57:39 -05:00
Cheridan 724759a01f Merge pull request #8611 from phil235/BotanyFix1 
Two botany fixes
 2015-03-30 09:51:24 -05:00
Cheridan 74d2d67280 Merge pull request #8604 from Niknakflak/NakedCorgis 
Adds the ability to shave all types of corgis
 2015-03-30 08:26:01 -05:00
Fayrik 9b834fca7a Look at all these bugs that no longer exist! 2015-03-30 03:36:24 +01:00
xxalpha d1f6edec01 Tweaked Close surgery step healing amount. 2015-03-30 02:28:21 +01:00
xxalpha 74d34a8ef1 Added Reviver implant. 
Added origin tech to Reviver implant.

Removed debug message.
 2015-03-30 02:26:47 +01:00