cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,443 Commits 61 Branches 14 Tags
5d97f324fc1615d90d1b46ebebc2ca450d34f6fa
Commit Graph

31780 Commits

Author SHA1 Message Date
oranges
5d97f324fc Update xenobiology.dm 2016-12-08 10:18:18 +13:00
KorPhaeron
98f45f8883 Fixes lore 2016-12-07 15:16:14 -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
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
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
KorPhaeron
c9dcd95473 Shuttle Requirements 2016-12-03 19:38:38 -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
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
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
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux 
Remove slash from end of type refs/defs
 2016-12-03 15:56:10 +11:00
Jordie
047f885069 Merge pull request #21869 from Mervill/ventcrawler 
Ventcrawler var now uses a define for it's options
 2016-12-03 15:56:02 +11:00
Mervill
19513c398c updates 2016-12-02 19:38:02 -08:00
Joan Lung
a25202f2a2 Fixes robot modules runtime! 2016-12-02 17:53:59 -05:00
Joan Lung
1fd4010b3c Starting servants may get their slab in a pocket instead of always in their backpack 2016-12-02 17:07:19 -05:00
Durkel
5f743b2957 changed the player min pop to 25 2016-12-02 16:32:44 -05:00
Cyberboss
65b2c6b83d Fine fine 2016-12-02 16:27:11 -05:00
XDTM
f38469b997 Easy peasy fix (#21878) 2016-12-02 14:17:44 -05:00
Cyberboss
0e9a26215c And another 2016-12-02 12:59:07 -05:00
Cyberboss
7d525c9c3e And another 2016-12-02 12:56:42 -05:00
Cyberboss
ed2dcc3424 Why can't any of us find all these things 2016-12-02 12:54:10 -05:00
Joan Lung
0fc959d694 Improves Geis binding resist (#21846) 
* Improves Geis binding resist

* rrrrgh

* FINE LIMIT IT OKAY
 2016-12-02 12:56:31 +01:00
AnturK
653ff618fb Merge pull request #21860 from MrStonedOne/patch-264 
Fixes a small oversight in timer subsystem
 2016-12-02 12:53:36 +01:00
Cheridan
06242ab811 Merge pull request #21865 from ExcessiveUseOfCobblestone/patch-5 
Fixes Revolver not being able to be redescribed
 2016-12-02 05:02:17 -06:00
XDTM
e57eac4ffd Proper color init 2016-12-02 10:29:26 +01:00
Mervill
5d56eeb96c oh, and this 2016-12-01 21:39:02 -08:00