cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,542 Commits 61 Branches 14 Tags
ace673e829f66a8a766aee2a641dc2a9f88eae87
Commit Graph

18560 Commits

Author SHA1 Message Date
KorPhaeron
ace673e829 Removes left inhand files, automatically mirrors inhands 2016-12-07 23:34:12 -06:00
KorPhaeron
d854909e0f Freon Removal (#22025) 
* Freon Removal

* Removes more freon sources
 2016-12-08 14:40:07 +13:00
PKPenguin321
b673897978 lowers swarmer spawner hp (#21975) 
3000 -> 750
 2016-12-08 12:44:27 +13:00
Fox McCloud
be94e4f76a Converts Hydroponics oneharvest var and Potato's Battery Quality into Plant Genes (#21983) 
* Converts Hydroponics oneharvest var into a Plant Gene

* plant batteries

* plant types

* stinging
 2016-12-08 12:43:23 +13:00
coiax
fcde5ac45d Enables the mice migration event (#21982) 
* Enables the mice migration event

🆑 coiax
add: Additional mice sometimes appear in the maintenance tunnels.
Engineers beware!
/🆑

I probably had too much fun writing this.

* Fixes grammar mistake

OOC: Thunder12345: not more than 15 of rodents
 2016-12-08 12:42:59 +13:00
Joan Lung
579944d0f3 Fixes some disposal unit weirdness (#21976) 
* Fixes some disposal unity weirdness

* miss, you need that line, miss
 2016-12-08 12:41:47 +13:00
oranges
a5a0dfc2bb Merge pull request #22014 from KorPhaeron/cyborg_tools 
Fixes sentience potion lore
 2016-12-08 10:18:26 +13:00
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
oranges
1285bdcc76 Merge pull request #21920 from ExcessiveUseOfCobblestone/areyouokgrab 
Legitimately Fixes The CtrlGrab Bug Now
 2016-12-07 22:30:06 +13:00
MisterTikva
d04143eedc Removes growth serum alternation between size 2 and size 1.5 and adds effects for higher dosages (#21962) 
* MARIO MEMES

* NEW MARIO MEMES

* NEW NEW MARIO MEMES
 2016-12-07 22:28:50 +13:00
oranges
1ea4f30436 Merge pull request #21969 from Cyberboss/patch-6 
Fixes canisters disconnecting from ports after relabeling
 2016-12-07 22:28:15 +13:00
MisterTikva
78c7d89110 Fixes gatfruit and ghost chili names (#21968) 
* Update chili.dm

* Update misc.dm
 2016-12-07 22:27:51 +13:00
oranges
333a57dad5 Merge pull request #21953 from Incoming5643/panic_bouncer 
The panic bouncer
 2016-12-07 22:26:56 +13:00
oranges
0db6aa232c Merge pull request #21960 from Mervill/coachferatu 
Fixes neck slot examine
 2016-12-07 10:20:49 +13:00
swindly
b8af084e79 Adds Anacea as a makeable toxin (#21932) 
* git gud doctors

* reward for doctors who got gud
 2016-12-07 09:43:36 +13:00
MisterTikva
0db492b1dd Implementing unused hydroponics code and some other botany tweaks. (#21938) 
* Update plant_genes.dm

* Update berries.dm

* Update pumpkin.dm

* Update melon.dm

* Update root.dm
 2016-12-07 09:42:21 +13:00
kevinz000
4f181774e5 [READY]FLIGHTPACK PATCH 1: Crashing rework, drifting tweaks and fixes, DataHUDs, and slight price decrease! (#21855) 
* pricedrop

* directionalcrashing

* ..

* kek woops

* ...

* changes

* HUDs

* woops

* huds...

* d

* Update flightsuit.dm

* Update mechfabricator_designs.dm

* .

* ..
	new file:   config/lavaruinblacklist.txt
	new file:   config/spaceruinblacklist.txt
	new file:   config/unbuyableshuttles.txt

* .

* fix

* Update timer.dm

* Update flightsuit.dm

* Update flightsuit.dm
 2016-12-06 14:47:37 +01:00
Shadowlight213
073631c665 Fixes mob_spawn effect syndicate ID access. (#21956) 2016-12-06 10:58:50 +01:00
Supermichael777
4ad8d89d03 Fixes the crime against language that was the juicer (#21946) 
* Fixes the crime afgainst language that was the juicer

* wew

* /'W'\ Rawwr im a shark
 2016-12-06 10:42:44 +13:00
oranges
16b3ac6e03 Merge pull request #21942 from Firecage/Suitsensorsbegone 
Ash Walkers now has a uniform without suit sensors.
 2016-12-06 10:40:03 +13:00
oranges
e7e54c1741 Tweak the change 2016-12-06 10:39:44 +13:00
ExcessiveUseOfCobblestone
b07589a933 Special SnowFood [Food Feature + Food-Related fixes] (#21935) 
* Fixes Food Renaming and sorts

* wew

* Pkp + Remie Review
 2016-12-06 10:35:44 +13:00
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
42ea446730 Cannisters stay connected after relabelling 2016-12-05 12:16:13 -05: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
Mervill
7c58401f7d fixes neck slot examine 2016-12-05 02:03:49 -08: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
Incoming
44c52a8348 requested changes 2016-12-04 22:09:12 -05:00
kilkun
12a6d0102b because orangutang asked 2016-12-04 21:37:12 -05:00
Incoming
e0324a6fc8 If a server has both a linked server and the panic bunker on, you can now choose to redirect new players to the linked server instead of denying them outright. 
You shouldn't use this if BOTH servers are panic bunkered, obviously.
 2016-12-04 21:27:17 -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
Firecage
bd152f6857 Ash Walkers now has a uniform without suit sensors. 2016-12-04 17:06:03 +02: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
ExcessiveUseOfCobblestone
2ba9739bd3 Legitimately Fixes The Bug Now 2016-12-03 18:31:01 -05:00
XDTM
62e5f34d41 fix (#21894) 2016-12-03 17:25:05 -05:00