cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 14:04:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,472 Commits 61 Branches 14 Tags
b2d1cb332ec856437dd5ff91082052c545a55b0b
Commit Graph

18531 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
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
kilkun
12a6d0102b because orangutang asked 2016-12-04 21:37:12 -05: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
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
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
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
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
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
698a09d933 Quantum Pads! 2016-12-03 16:09:46 +01: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
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
XDTM
f38469b997 Easy peasy fix (#21878) 2016-12-02 14:17:44 -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
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
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Cheridan
5f4eb139e6 Merge pull request #21868 from Mervill/quicklint 
Quick code lint
 2016-12-01 23:04:56 -06:00
Cheridan
cae7ac9466 Merge pull request #21859 from XDTM/BlueFix 
Fixes bluespace golem's teleport
 2016-12-01 23:00:03 -06:00
kevinz000
79ff9a8f0b [READY]Lollipops, gumballs, and a cyborg module that shoots them out! (#21782) 
* lollipop

* ...

* Update snacks_other.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Update snacks_other.dm

* stuffs

* itallworksnow

* updates

* mfw kor caught me

* wew

* completed.

* sprites

* thisshouldworkmaybeprobablyidunno

* ...

* Update robot_items.dm

* projectiles

* Update robot_items.dm

* ...

* fuckingnames

* Update robot_items.dm

* .

* ..

* ...

* spamchecking

* ..()

* ..

* ..

* ..

* Update robot_items.dm

* defines refines 2

* Update robot_items.dm
 2016-12-02 15:42:51 +13:00
oranges
a64f7a9df1 Merge pull request #21862 from kevinz000/refines-my-defines 
optimumtact commented an hour ago: CHERI, THEY DIDN"T USE THE DEFINE
 2016-12-02 15:42:07 +13:00
XDTM
fc8d1d6be3 Fixed bugs 2016-12-02 00:46:49 +01:00
MrStonedOne
b29f1eb067 Makes using the cheat engine to remove darkness or ai static harder 2016-12-01 14:38:28 -08:00
Cheridan
89d3752276 Merge pull request #21584 from RemieRichards/swarmer_boss 
Adds a new boss: Swarmer Swarm [Now a Ruin]
 2016-12-01 07:47:54 -06:00
Kyle Spier-Swenson
5f722df728 Cid Randomizer Detector will not check webclients 
or any client type that isn't seeker.

The randomizer doesn't work on the webclient, and it wouldn't matter anyways because the webclient's cid is worthless.
 2016-12-01 00:45:49 -08:00