coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,472 Commits 9 Branches 11 Tags
b2d1cb332ec856437dd5ff91082052c545a55b0b
Commit Graph

31799 Commits

Author SHA1 Message Date
oranges b2d1cb332e Merge pull request #21923 from ExcessiveUseOfCobblestone/helmfix 
Hotfix: Sechelm Button Edition
 2016-12-06 10:34:26 +13:00
oranges cf75fd46e0 Merge pull request #21917 from ChangelingRain/lightburn 
Volt Void and Interdiction Lenses will burn out lights for a burst of power
 2016-12-06 10:31:36 +13:00
oranges 2ff260d63d Merge pull request #21936 from Cyberboss/patch-5 
Better addtimer logging
 2016-12-06 10:20:30 +13:00
oranges 4f848deb43 Merge pull request #21931 from Incoming5643/stop_making_me_be_productive 
Server defined round populations / support for roundtypes that only run in low populations
 2016-12-06 09:10:31 +13:00
oranges 35bf51ad1b Merge pull request #21872 from JJRcop/fontoffline 
Moves Font Awesome into source tree from jsdelivr
 2016-12-06 09:09:56 +13:00
oranges bc85a2b978 Merge pull request #21915 from XDTM/QuantumPads 
Quantum Pads
 2016-12-06 09:09:21 +13:00
oranges 1c749bc0fb Merge pull request #21933 from kilkun/master 
Very minor SWAT suit changes with fresh lore.
 2016-12-06 09:03:54 +13:00
Cyberboss adb9930632 Makes wall igniters, fire, and air alarms fireproof (#21922) 
* Makes wall igniters fireproof

* Air alarms

* Fire alarms
 2016-12-05 09:49:12 -06:00
Cheridan 19404e5d06 Merge pull request #21925 from ExcessiveUseOfCobblestone/Fixes-Salt 
Fixes Salt
 2016-12-04 21:52:03 -06:00
Firecage b957fd606b Fixes bug with secondary Chaplain Null Rods not being morphable. (#21921) 
* Cures multiple nullrod syndrome.

* Just .dme change
 2016-12-04 21:22:46 -06:00
Cheridan 688e8b57b8 Merge pull request #21926 from KorPhaeron/shuttles 
Allows adding prerequisites to purchasing shuttles
 2016-12-04 20:48:26 -06:00
kilkun 12a6d0102b because orangutang asked 2016-12-04 21:37:12 -05:00
Cheridan d402f7620c Merge pull request #21919 from ChangelingRain/tileproselytizing 
You can now proselytize floor tiles
 2016-12-04 20:20:18 -06:00
Joan Lung 551ede6d35 Kills all remaining text pronoun macros (#21916) 
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
 2016-12-04 21:32:31 +01:00
Incoming5643 2c82b2d65e The time left on a shuttle call/recall modifies with security level. (#21906) 
* The time left on a shuttle call/recall will now correctly modify with changes in the alert status.

As added functionality Code Green shuttle calls no longer need a reason (though you can still give one) and take 20 minutes to arrive.

* Takes out the fun part (for now)
 2016-12-04 18:47:17 +01:00
GunHog b283fd04e8 Advanced Mop can now make its own water (#21903) 
* Advanced Mop can now make its own water

The Advanced Mop can now produce its own water at a rate of 1 unit per
process().

The advanced mop now has a switch to toggle wetting itself.

* Tweaks

Uses the proper return ..()
Rearranged the text a little.
 2016-12-04 18:42:23 +01:00
Pieter Vlasblom 1fa7bd106e Prevent AI players from clicking on hidden turfs by modifying their client. (#21912) 2016-12-04 18:36:17 +01:00
Pieter Vlasblom 2da5d58156 Prevent people from abusing certain aspects of the game by keeping alert prompts open (#21914) 2016-12-04 18:30:34 +01:00
oranges deb718e876 Merge pull request #21899 from ChangelingRain/slabsgoinpockets 
Starting servants may get their slab in a pocket instead of always in their backpack
 2016-12-04 23:13:31 +13:00
oranges c304c5f9d7 Merge pull request #21896 from Cyberboss/patch-3 
Another bad addtimer
 2016-12-04 23:12:57 +13:00
Mervill 3f68bd7202 Merge branch 'master' into a_intent 
Conflicts:
	code/modules/mob/mob_defines.dm
 2016-12-04 00:38:37 -08:00
Jordie 4a37f57e7c Merge pull request #21911 from Mervill/m_intent 
m_intent now uses defines
 2016-12-04 19:34:42 +11:00
Cyberboss 51c463815d Better addtimer logging 2016-12-04 01:17:09 -05:00
kilkun 3993b30fe3 Minor fluff changes, captain hardsuit buff 
wew
 2016-12-03 23:40:43 -05:00
oranges f3acff4706 Adds a ckey whitelist, stripping out some dead code (#21875) 
* Adds a whitelist, stripping out some dead code in the process

Old job whitelist that wasn't used has been removed.

Config has been repurposed, uncomment USEWHITELIST, only ckey's in
admins.txt or whitelist.txt in the config will be allowed to connect to
the server

* More examples

* Add a guy

* Update whitelist.txt

* Put him in
 2016-12-04 15:33:15 +11:00
Incoming dc1f62fd4d You can now define a maximum number of players for a roundtype if you so desire, but no round type currently does this. 
Server owners can now futz around with the minimum / maximum number of players for roundtypes via game_options.txt
 2016-12-03 22:55:28 -05:00
KorPhaeron c9dcd95473 Shuttle Requirements 2016-12-03 19:38:38 -05:00
ExcessiveUseOfCobblestone 3872efb880 Fixes Salt 2016-12-03 19:36:03 -05:00
ExcessiveUseOfCobblestone 18373720d0 Fixes Sechelms 2016-12-03 19:30:15 -05:00
Cheridan 5ba1f2f3c3 Merge pull request #21900 from Durkel/Lings 
Gives traitorchan a minimum pop limit
 2016-12-03 18:20:23 -06:00
Cheridan 4ed00ae723 Merge pull request #21901 from ChangelingRain/hotheruntime 
Fixes robot modules runtime!
 2016-12-03 18:04:51 -06:00
XDTM 62e5f34d41 fix (#21894) 2016-12-03 17:25:05 -05:00
Joan Lung 12aa57fd7e You can now proselytize floor tiles 2016-12-03 17:03:29 -05:00
Joan Lung 3a2a718def Volt Void and Interdiction Lenses will burn out lights for a burst of power 2016-12-03 15:55:13 -05:00
XDTM 08acc73977 no cheese 2016-12-03 20:50:00 +01:00
Razharas 4993e2146b Merge pull request #21888 from XDTM/VineCodeScaresMe 
Fixes a couple of kudzu bugs
 2016-12-03 21:26:17 +04:00
XDTM 628f1fffe2 ) 2016-12-03 17:05:08 +01:00
XDTM 26b951d917 Fixes fixes 2016-12-03 16:57:37 +01:00
XDTM b826cfe689 Better checks 2016-12-03 16:26:20 +01:00
XDTM c9375339d7 ...and the damn file itself 2016-12-03 16:11:29 +01:00
XDTM 698a09d933 Quantum Pads! 2016-12-03 16:09:46 +01:00
oranges 66fd6cc571 Merge pull request #21858 from ChangelingRain/cyborgbuff 
Converted engineering and miner cyborgs can now create Sigils of Transgression
 2016-12-04 01:11:06 +13:00
oranges f8f78a9730 Merge pull request #21886 from RandomMarine/itsasinglefuckinglinechangewowwhoa 
Deconstructed airlock assemblies keep their original name when rebuilt.
 2016-12-04 01:08:58 +13:00
oranges 11b7f715a8 Merge pull request #21885 from ChangelingRain/metalfix 
Fixes not being able to proselytize metal
 2016-12-04 01:08:46 +13:00
oranges f17e691fdb Merge pull request #21882 from ChangelingRain/timeprobably 
The station time for silicons and observers now ignores roundstart
 2016-12-04 01:08:29 +13:00
oranges 7ee8ad97b4 Merge pull request #21880 from ChangelingRain/itempickup 
Items created by scripture will be put in your offhand if possible
 2016-12-04 01:08:09 +13:00
oranges 5fdacaa70d Merge pull request #21874 from MrStonedOne/patch-266 
Cid Randomizer Detector will not check webclients
 2016-12-04 01:07:13 +13:00
Mervill 481cc07dcf m_intent now uses defines 2016-12-03 00:25:44 -08:00
Mervill d4a49d509d added INTENT_NEXT 2016-12-03 00:08:55 -08:00
WJohn 96c93f6b38 Merge pull request #21870 from KorPhaeron/cyborg_tools 
Engineering Cyborg Tools Now Use the Default Sprites
 2016-12-03 02:53:11 -05:00