coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

13853 Commits

Author SHA1 Message Date
PKPenguin321 1b4b672af9 carrot shivs 
git went rough on my ass and im not happy about it
 2016-01-29 22:05:47 -08:00
tkdrg 8f0e610de6 Merge pull request #15024 from optimumtact/spideralert 
Change spider ghost alert to an in chat one
 2016-01-30 01:26:34 -03:00
tkdrg 41fd154e3f Merge pull request #14996 from KorPhaeron/white_ship 
Allows you to use the abandoned white ship as an escape shuttle
 2016-01-30 01:25:40 -03:00
tkdrg 0ff42cb218 Merge pull request #14962 from Boredone/ReRadioactiveArmor 
Radioactive Teleport Armor
 2016-01-30 00:27:13 -03:00
tkdrg b2688de3a2 Merge pull request #15022 from optimumtact/adminsgettingspammedtheymightbanus 
Don't message admins when a grenade goes bang
 2016-01-29 23:32:25 -03:00
erwgd ac535a3053 Adds salt and pepper to Kitchen vendor, adds botany tools to nutrimax, adds rice seeds to seeds vendor 2016-01-30 02:11:29 +00:00
xxalpha 06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea 2016-01-30 01:29:26 +00:00
xxalpha e3670adb02 area/setup() 2016-01-30 01:28:44 +00:00
xxalpha 3df42cfdba Added new event: portal storm. 
need the file of course

world name
 2016-01-30 01:23:55 +00:00
tkdrg 18fe39aaf3 Merge pull request #15009 from MrStonedOne/patch-141 
Removed atom movable Del() proc override
 2016-01-29 21:59:46 -03:00
GunHog 1766296007 Detachment fix 
Detaching medigun now properly shuts it down
 2016-01-29 18:40:59 -06:00
KorPhaeron 450251b2cb Doomsday 2016-01-29 13:24:22 -06:00
Nerd Lord 7feff1605f get turf not loc 2016-01-29 14:12:17 -05:00
Nerd Lord a401975b0e Fixes a few things to use temporary overlays 2016-01-29 14:02:41 -05:00
Razharas b124302e47 Merge pull request #15011 from ChangelingRain/passtheblob 
Blobs use canpass to check if they can expand instead of a density check
 2016-01-29 21:27:47 +03:00
Nerd Lord 966ccd0921 literally a style change 2016-01-29 11:38:05 -05:00
oranges d103d6c648 Change spider ghost alert to an in chat one 
This could actually benefit from a nice subystem to handle it (calling humanize_from_ghost) on the appropriate atom when the user clicks the link
 2016-01-29 15:42:05 +13:00
oranges 34bdee117d Don't message admins when a grenade goes bang 
Keeps it in the game log though (for investigations)
 2016-01-29 01:32:30 +00:00
Razharas 0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
tkdrg 776598f1f6 Merge pull request #14974 from KorPhaeron/slaughter 
Clarifies slaughter demon event comments
 2016-01-28 20:47:21 -03:00
tkdrg 45659129d3 Merge pull request #14919 from KorPhaeron/remove_grab10 
Removes grab from bins
 2016-01-28 20:24:59 -03:00
KorPhaeron 005540a9cc Timer 2016-01-28 17:15:28 -06:00
tkdrg 0dda9b993b Merge pull request #14930 from Shadowlight213/Janiborglightbuff 
Greatly decreases janiborg light replacer refill time.
 2016-01-28 19:30:16 -03:00
Razharas 4df135e073 Merge pull request #15001 from xxalpha/cameranew 
Fixed camera/New().
 2016-01-29 01:27:22 +03:00
tkdrg 38ffa0d9a0 Merge pull request #14973 from KorPhaeron/abductor 
Lizard nerfs
 2016-01-28 18:53:39 -03:00
tkdrg 592ee7dbd3 Merge pull request #14976 from KorPhaeron/chairs 
Fixes being unable to unbuckle people
 2016-01-28 18:32:56 -03:00
Razharas 8c0694463e Merge pull request #14853 from RemieRichards/MechaPilots 
Mecha pilots!
 2016-01-29 00:28:14 +03:00
xxalpha e75d6ca09b Fix smooth shuttle sprites 
No maps
 2016-01-28 21:05:20 +00:00
KorPhaeron 5badf64caf Titlescreen 2016-01-28 13:49:33 -06:00
Nerd Lord 6c4abd0c2f blobs use canpass to check if they can expand instead of a density check 2016-01-28 12:45:02 -05:00
Kyle Spier-Swenson 8e36dee8db Removed atom movable Del() proc override 
It did nothing, and it's called on gc as well as del(), causing 2 proc call overheads as it gets called and then it calls ..()
 2016-01-28 08:43:45 -08:00
Bjorn Neergaard f93822c195 Allow tgui input() to be 0, fix SMES components 
Fixes #14965
 2016-01-28 07:10:37 -06:00
KorPhaeron 4edf2a3d08 Typeless Loops 2016-01-28 04:27:10 -06:00
xxalpha 3f0c519a37 Fixed camera/New(). 2016-01-28 06:56:13 +00:00
KorPhaeron 20731df76b Embarrassing Fix 2016-01-28 00:54:54 -06:00
KorPhaeron 9beeea758f Unterminated text 2016-01-28 00:46:54 -06:00
KorPhaeron 00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
KorPhaeron cfa3ff2a24 Makes objectives function properly 2016-01-27 23:59:14 -06:00
KorPhaeron c8bccbd0a5 Laserguns 2016-01-27 21:14:08 -06:00
KorPhaeron d347f1f36e Fixed even more 2016-01-27 14:39:45 -06:00
KorPhaeron 05e9b072e0 Chairs 2016-01-27 14:03:19 -06:00
KorPhaeron f4171f0787 Clarifies slaughter demon event 2016-01-27 13:54:41 -06:00
KorPhaeron 08f9c25a28 Lizard nerfs 2016-01-27 13:47:20 -06:00
Razharas 059652dbf6 Merge pull request #14920 from ChangelingRain/commblob 
Adds blob early communication button
 2016-01-27 20:18:52 +03:00
Razharas d0391ba661 Merge pull request #14942 from ChangelingRain/livingblobs 
Blob mode now also checks for overminds before ending
 2016-01-27 20:18:16 +03:00
Firecage d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
xxalpha 379eb05015 Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-27 14:50:06 +00:00
duncathan salt fd6482f8cb Merge pull request #14905 from Razharas/Assembly 
Some assembly requaired
 2016-01-27 08:03:00 -06:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Boredone c025c3c243 This commit switchs the teleport armor in the RD's Locker to the reactive/teleport child which causes radiation. 2016-01-27 01:47:24 -07:00