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

15714 Commits

Author SHA1 Message Date
phil235 e11a405165 Fixes the holopad choice window spam. The holopad now uses the standard popup window used by computers and most machines. A simple click to close it. 
Fixes /obj/item/clothing/suit/space/pirat hiding the mob's jumpsuit when worn.
 2015-04-07 17:44:43 +02:00
hornygranny e957233907 Merge pull request #8772 from MrPerson/foam_fixarooney 
Fixes cleaner grenades
 2015-04-06 16:09:35 -07:00
phil235 1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
 2015-04-06 19:38:51 +02:00
WJohn 9c4e744fc9 Merge pull request #8744 from xxalpha/cyberplus 
Better sprites for chest cyber implants.
 2015-04-06 12:43:10 -04:00
Cheridan 062d0c2086 Merge pull request #8759 from optimumtact/patch-3 
Fix can_speak check in megaphone
 2015-04-06 08:48:49 -05:00
Cheridan 1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2 
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
 2015-04-05 21:54:33 -05:00
Incoming5643 d0144030e0 Good use of commits there Incoming 2015-04-05 20:45:53 -04:00
Incoming 1ee2cbb9ac Fine whatever I don't care 
-Tommy Wiseau
 2015-04-05 20:41:26 -04:00
Incoming 5591e93372 Fixes my fix to fix the infinite overmind death mambo fix 2015-04-05 20:28:48 -04:00
MrPerson 94c0c1598d Fixes cleaner grenades 
Fixes #8757
Default for locate is "in world"!
 2015-04-05 16:55:17 -07:00
Remie Richards a965f17c3c Corrects return values, fixes cell draining. 2015-04-05 22:03:41 +01:00
Remie Richards 5884c3727f Fixes nonnumerical defines, Special interaction should work nicer now. 2015-04-05 21:52:42 +01:00
Orange Borg a5306ba1e0 Fix can_speak check in megaphone 
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
 2015-04-05 20:29:07 +12:00
Remie Richards cb86467e47 Consistency with X_act() names, Ninjas can now electrocute carbon mobs by "draining" them, as they would a cell/smes/mecha etc. 2015-04-05 02:30:43 +01:00
Remie Richards 9c6c68b81a Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas) 2015-04-05 01:55:27 +01:00
Remie Richards bebe775021 Splits ninja glove drain() proc up into /atom/proc/ninjaDrainAct() 2015-04-05 00:09:28 +01:00
xxalpha 8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
phil235 6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes 
Recieve --> Receive
 2015-04-04 20:00:21 +02:00
Remie Richards 5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
Jordie 6d4f3b60f8 Merge pull request #8663 from dannno/sadclown 
sad trombone for clown pda
 2015-04-04 20:58:21 +11:00
Jordie 6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings 
Someone called for pest control?
 2015-04-04 20:58:07 +11:00
Jordie 8d2f92cdd3 Merge pull request #8683 from AnturK/pickets 
Adds Picket Signs
 2015-04-04 20:57:56 +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 20ed6aada5 Merge pull request #8668 from ACCount12/syndieboxes 
Toolboxes & welders update
 2015-04-04 20:57:15 +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
Fayrik a634bf7f8a Fixes unreported bug that would delete the cargo shuttle if it was sent to a shuttle loan event while in transit. 2015-04-04 10:54:06 +01:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
Remie Richards b35411608f Merge pull request #8712 from tgstation/revert-8684-chem_farts 
I WAS WRONG. YOU PEOPLE DON'T **DESERVE** MY FARTS
 2015-04-03 22:44:16 +01:00
Remie Richards 862657bd7c Merge pull request #8421 from dannno/guncases 
gun lockers
 2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales 1f94f2fe27 Update guncase.dm 
change 4 to capacity
 2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales 8de848eccb Update guncase.dm 2015-04-03 13:16:25 -04: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
danno "big fucking moron" gonzales cd3f2516e0 Update PDA.dm 
i fucked up
 2015-04-02 16:42:14 -04:00
dannno fcd5938545 Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown 2015-04-02 16:30:08 -04:00
Artur 3ff5980e85 - Adds Picket Signs 2015-04-02 18:23:17 +02:00
dannno 6cba1d829c a buhhhhhh buhhhhhhhhhh 2015-04-02 10:21:06 -04:00
Jordie 5be93a2b1a Merge pull request #8635 from Xhuis/phazon_nerf 
Phazon construction nerf
 2015-04-02 20:27:32 +11:00
Jordie a8a2ffc123 Merge pull request #8662 from phil235/AddBloodFix 
Fixes lack of dna in old blood.
 2015-04-02 20:25:38 +11:00
Jordie 32e7e5444a Merge pull request #8665 from Xhuis/malf_z_nerf 
Causes malfunctioning AIs who leave the station to lose the round
 2015-04-02 20:25:26 +11:00
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
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