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
54,093 Commits 61 Branches 14 Tags
bf8983dd7edbedf4217c5779300d58a69ade8360
Commit Graph

24107 Commits

Author SHA1 Message Date
Leo
bf8983dd7e Merge pull request #35150 from DaxDupont/myanusisbleeding 
Fixes a naughty dot
 2018-01-31 22:38:29 -02:00
Leo
6c1d7cf6b8 Merge pull request #35145 from vuonojenmustaturska/acidtypos 
Fixes a couple of typos and ports one New to Initialize
 2018-01-31 20:14:22 -02:00
Ashe Higgs
cf5e28ad83 Give integration cogs power generation (#35181) 2018-02-01 09:09:44 +13:00
Jordan Brown
9e0eaa3b00 Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong 
Tomatoes and other foods found to have girl parts; removed from vegetable piles
 2018-01-31 10:10:31 -05:00
ShizCalev
3c345d99de Fixes lightfixture placement issue 2018-01-31 09:04:51 -06:00
AnturK
5c8195cebc Removes maptext on morph restore. 2018-01-31 09:04:02 -06:00
Liam
85976b0e39 bye 2018-01-30 14:53:13 -06:00
Dax Dupont
7968bd40f7 Fixes errand dot 2018-01-30 21:27:34 +01:00
Robustin
418a8c0112 Cult Update (#33810) 
* Cult overhaul
 2018-01-30 21:59:03 +02:00
vuonojenmustaturska
8cbd99d740 a commit 2018-01-30 20:24:17 +02:00
Iamgoofball
779e65b254 Cleans up wirer code. (#35116) 
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
 2018-01-30 20:16:39 +02:00
vuonojenmustaturska
f45742a033 Heartless humans now display as unsuitable for abductor experiments (#34951) 2018-01-30 15:25:17 -02:00
ExcessiveUseOfCobblestone
8aa5372cd7 Turrets now check borgs! (#35045) 
* epic

* epic2

* epic

* 150 hours

* 150^2 hours
 2018-01-30 18:04:19 +02:00
Jalleo
8c9478ca24 Potato battery nerf (#35081) 
* Very temp I want to see what people believe is a more suitable size because this is ridiculous

* Damn comments being my bane when I have to redo a local branch and mess up grr

* Does the request from the maintainer
 2018-01-30 10:17:53 -05:00
nicbn
d51bd414ef Changes MMI to use sprite overlays (#35088) 
* MMI now uses overlays

* .
 2018-01-30 10:14:23 -05:00
Jordan Brown
b8836913cc Merge pull request #35087 from nicbn/bloodpack 
Adds greyscale filling for bloodpack
 2018-01-30 10:12:52 -05:00
Jordan Brown
eaed68921f Merge pull request #35085 from GLACoding/Slime-Nutrient-Fix 
Slimes start at 700 nutrition
 2018-01-30 10:08:26 -05:00
vuonojenmustaturska
08b7dfd420 Merge pull request #35075 from KorPhaeron/watchlist3 
Watchlist alert now includes a timestamp of when it was created
 2018-01-30 15:10:32 +02:00
MoreRobustThanYou
65fd10893d Announced messages while drunk will be slurred (#34651) 
* Announced messages while drunk will be slurred

* Minor announcements, too!

* Update requests_console.dm

* Update communications.dm

* Fixup.

* Update requests_console.dm
 2018-01-30 02:42:42 -05:00
XDTM
abb452e288 Adds multi-mind support to slimepeople (#34696) 
* Adds multi-mind support to slimepeople

* keep dead bodies in the pool
 2018-01-30 08:34:43 +01:00
Ashe Higgs
122fb29280 Adds wall-attached defibrillator mounts (#34545) 
* Adds defibrillator mounts

* Update medical.dm

* Cyberboss requests, take two

* Requests by AnturK
 2018-01-30 08:33:52 +01:00
Shadowlight213
6507dd3515 Makes pluoxium have the same air alarm settings as oxygen (#35082) 2018-01-30 00:46:46 -06:00
brettdavies1995@gmail.com
025d2b976e no wonder it went wrong, you put tomatoes in with your meat! 2018-01-30 01:15:56 +00:00
brettdavies1995@gmail.com
77ef72e988 Fruit have ovaries, vegetables have schweenuses, see carrot 2018-01-30 00:45:06 +00:00
Dax Dupont
eca04302ec Expand Cyborg (#34958) 
* Expand Cyborg

* i ded pls nerf

* Oh sheet
 2018-01-29 18:30:58 -05:00
Ashe Higgs
d6cae1f6e1 Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849) 
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
 2018-01-29 21:33:40 +01:00
vuonojenmustaturska
5afb33f24f Merge pull request #35047 from ShizCalev/servant_blocker-bomb 
Fixes being able to bomb servant blockers
 2018-01-29 22:33:12 +02:00
Ashe Higgs
54f5be614a brief CC power patch (#34880) 2018-01-29 21:32:46 +01:00
BordListian
74a6cb1d10 Makes fire colorful and anime (#34977) 
* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.
 2018-01-29 22:29:43 +02:00
kevinz000
26ad237862 Projectile hitscan refactor and visuals (#34363) 
Moves beam rifle snowflake code up to projectile level for a proper hitscan system.

🆑
rscadd: Chameleon laser guns now have a special firing mode, activated by using them in hand! Only certain gun disguises will allow this to work!
/🆑
 2018-01-30 09:23:51 +13:00
uraniummeltdown
24204d4e28 replaced solar panel sprites with better ones 2018-01-29 11:02:29 -06:00
PKPenguin321
fa08aaf7fe adds extendohands (#34599) 
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
 2018-01-29 18:36:35 +02:00
Leo
0e0be53084 Merge pull request #35058 from uraniummeltdown/chatsquash 
Better Chat Squashing
 2018-01-29 14:34:35 -02:00
vuonojenmustaturska
9df47d0962 Buffs BZ gas by allowing it to interfere with lings' hivemind access and chem regen (#35061) 2018-01-29 14:32:10 -02:00
Jordan Brown
e72eebcf52 Fixes blood contract names (#35064) 2018-01-29 14:28:34 -02:00
vuonojenmustaturska
24f1cb134a Merge pull request #35072 from ChuckTheSheep/Morgue-and-Crematorium-Directional-Sprites-+-fixes 
Morgue and Crematorium Directional Sprites + Number of related fixes (Retrying #35068)
 2018-01-29 18:23:29 +02:00
XDTM
d679d7bee1 Uses the new trait system on some chems (#34893) 
* Uses the new trait system on some chems
 2018-01-29 16:44:40 +02:00
vuonojenmustaturska
4015ef5d0b Merge pull request #35055 from 81Denton/hecking-typo 
Typo fix in Bubblegum desc and outdated comment
 2018-01-29 13:08:01 +02:00
Cruix
f76b3e3b29 Added map generation lava protection to the syndicate lava base (#34764) 
* Added mapping helper for preventing lava river generation

* Added lava protection to the syndicate base bridge

* Re-added decals to the syndicate lava base bridge
 2018-01-29 11:02:33 +01:00
XDTM
3ecf74f1fd Xenobiology consoles can now scan slimes and apply potions (#34748) 
* Xenobiology consoles can now scan slimes and apply potions

* no smack
 2018-01-29 10:59:13 +01:00
XDTM
9b93747d36 Abductor additions: replaces and improves glands, new surgery type (#35012) 
* Abductor additions: improves glands, new surgery type

* fixes
 2018-01-29 11:50:32 +02:00
Kyle Spier-Swenson
265b5e0e45 Makes the asset cache faster (#35003) 
Winexists contacts the client and blocks, slowing down asset cache sends needlessly.

We now send multiple assets between verified sends. speeding up how quick preloading happen and reducing the number of junk files created in the clients cache.
 2018-01-29 04:04:31 -05:00
Emmett Gaines
bf1706e3a6 fixes changing direction with control moving you in that direction (#35051) 2018-01-29 03:57:34 -05:00
BordListian
b69d54af50 - Fixes weird edge cases when singular pipes are placed between already wrenched components 2018-01-29 00:56:07 -06:00
Jordan Brown
9dfe23b8f8 Merge pull request #35021 from MrStonedOne/patch-465 
revert vis_contents atmos gases so that 511 clients can see gas until byond can make 512 clients not crash
 2018-01-28 23:40:12 -05:00
Jordan Brown
8739e68b07 Merge pull request #34988 from XDTM/SayNoToNuclearNerfs 
Replaces pax in PK borgs with a version that expires faster
 2018-01-28 23:39:47 -05:00
Mark9013100
de0106708f Adds cloning data disks to techwebs 2018-01-28 22:05:45 -06:00
nicbn
b19975b3fb Adds greyscale filling for bloodpack 2018-01-28 23:03:07 -02:00
Nick
4d6f06ec80 Readds bz canisters to cargo order packs (#34950) 
* Update packs.dm

* Update packs.dm
 2018-01-29 02:38:07 +02:00
tortellinitony
b9078e1cb4 Makes adminsay bind F3 work (#35028) 2018-01-28 19:30:19 -05:00