cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,925 Commits 61 Branches 14 Tags
41eee01d093badd325cb961fdc034bded185e9ee
Commit Graph

16622 Commits

Author SHA1 Message Date
Joan Lung
41eee01d09 \n 2016-06-20 20:15:29 -04:00
Joan Lung
971df0d8de info 2016-06-20 10:36:01 -04:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split 
Splits languages into languages_spoken and languages_understood.
 2016-06-19 15:23:38 -04:00
unknown
f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662) 
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
 2016-06-19 14:05:18 -05:00
Cheridan
06d8cf8491 Merge pull request #18718 from AnturK/buncha_fixes 
Minor fixes
 2016-06-19 12:31:58 -05:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685) 
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
 2016-06-19 17:26:35 +02:00
AnturK
1e51270078 Use RANGE_TURFS 2016-06-19 14:38:08 +02:00
AnturK
48df887fad Fixes #17701 2016-06-18 19:22:59 +02:00
Cheridan
9c59db6cd0 Merge pull request #18659 from MrStonedOne/patch-217 
fixes ghost vv.
 2016-06-18 11:30:48 -05:00
unknown
b12398e9fc Resolved conflicts. 2016-06-18 12:17:00 -04:00
Cheridan
4e4f394a60 Merge pull request #18674 from tgstation/RemieRichards-わたしのなまえはレミエです 
Fixes Anime Names
 2016-06-18 11:14:31 -05:00
Cheridan
caf6352581 Merge pull request #18675 from coiax/plz-no-i-have-a-drone-family 
Drones have the silicon faction by default
 2016-06-18 11:09:32 -05:00
Cheridan
6031ce1bab Merge pull request #18676 from Xhuis/cherry_bombs_again_kappa 
Ambrosia gaia balancing
 2016-06-18 11:02:59 -05:00
oranges
eaa85a4931 Merge pull request #17069 from MrStonedOne/XKeyscore 
Automatic Proxy Detection
 2016-06-19 01:17:59 +12:00
AnturK
7237a3effc Fixes #18035 2016-06-18 12:42:13 +02:00
Jordie
47c184bd41 Merge pull request #18656 from Niknakflak/MewMew 
Adds the catghost to donator's special ghosts
 2016-06-18 19:53:47 +10:00
oranges
24eb2c81ac Merge pull request #18690 from KorPhaeron/fulton_patch 
[s]Missing return added to fultons
 2016-06-18 14:43:12 +12:00
KorPhaeron
c082b7df5a Missing return added to fultons 2016-06-17 19:08:41 -05:00
oranges
c2542801fe Merge pull request #18637 from lzimann/patch-9 
Adds admin message when canister with BZ is open
 2016-06-18 11:36:20 +12:00
Leo
cbf976affd fix it 2016-06-17 20:10:14 -03:00
oranges
0568b8ebce Merge pull request #18636 from coiax/fix-18630 
Drones can hear robotic talk
 2016-06-18 10:57:55 +12:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
oranges
efb4b6ac2d Merge pull request #18628 from coiax/fix-18579 
Snow holodeck is now cold, but air pressure
 2016-06-18 10:36:21 +12:00
Razharas
4d9d643db7 Merge pull request #18642 from ChangelingRain/holobuff 
Changes holoparasite balance
 2016-06-18 00:51:09 +03:00
Remie Richards
2bf7841de3 Fixes stupid mononamers 
But only because it would runtime.
 2016-06-17 20:33:50 +01:00
Jack Edge
510efdd9a5 Re-adds golem design disk code 2016-06-17 19:48:01 +01:00
Xhuis
7bd5dd5168 Makes cherry bombs auto-delete on explosion 2016-06-17 10:51:51 -04:00
Xhuis
6289801964 Hydroponics changes 2016-06-17 10:46:55 -04:00
Jack Edge
7c28194f66 Drones have the silicon faction by default 
🆑
rscdel: AI turrets no longer fire at drones.
/🆑

- Also cleaned up some stuff in portable_turret.dm while I was there
 2016-06-17 15:40:27 +01:00
Remie Richards
89c9f6d86d Fixes Anime Names 
casually forgetting that gender defines are numbers
 2016-06-17 15:35:42 +01:00
MrStonedOne
d220416ed3 Makes ipintel only warn, fixes some cache things. 2016-06-17 03:54:42 -07:00
Joan Lung
a6482c76b2 i'm moving all the levers 2016-06-17 06:54:09 -04:00
Kyle Spier-Swenson
b28b4b8237 State department has censored this commit 2016-06-17 01:53:04 -07:00
Kyle Spier-Swenson
658fe55f57 icon state too. 2016-06-17 01:52:32 -07:00
Kyle Spier-Swenson
2beafae7e0 Should call the parent too, incase that ever matters. 2016-06-17 01:47:02 -07:00
Kyle Spier-Swenson
f2b16cd17d Redpills ghost vv. 
Fixes being unable to edit icon or fun_verbs in vv on ghosts.
 2016-06-17 01:45:57 -07:00
NikNakFlak
43193e8e4c Cat ghost cat ghost does whatever a cat ghost does 2016-06-17 01:10:50 -07:00
oranges
030911962a Merge pull request #18652 from Xhuis/i_swear_it_worked_in_testing_too 
Several lavaland fixes
 2016-06-17 16:28:15 +12:00
oranges
0c07f80928 Merge pull request #18614 from KazeEspada/randomizedfix 
Fixes Randomized Crates
 2016-06-17 16:24:23 +12:00
Xhuis
df08005b60 Two fixes 2016-06-17 00:13:17 -04:00
MrStonedOne
c37ae784e7 Adds local cache, doesn't check reconnects, fixes bugs 2016-06-16 21:04:52 -07:00
MrStonedOne
2523a0d604 whitespace and code formatting changes. 2016-06-16 21:04:52 -07:00
MrStonedOne
d67b9cbe0c Removes debugging messages 2016-06-16 21:04:51 -07:00
MrStonedOne
2366eb1a20 PUTS NIKNAK OUT OF A JOB! 2016-06-16 21:04:50 -07:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398) 
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
 2016-06-16 22:00:09 -05:00
oranges
8c9308acca Merge pull request #18613 from Core0verload/runtime_down 
Puts down two runtimes
 2016-06-17 13:40:03 +12:00
KorPhaeron
5fe4f395e9 Fulton Revival (#18480) 
Miners can now purchase fulton extraction packs.
Miners can now purchase fulton medivac packs.
Two new fulton related bundles are available for purchase with vouchers.
 2016-06-17 13:35:47 +12:00
Militaires
76c4bcc0ea xenomorph maid reskin for byond members (#18545) 
Adds a new sprite that byond members can access when being the xenomorph queen
 2016-06-17 13:32:08 +12:00