cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,694 Commits 61 Branches 14 Tags
93077ab2e356edf025191dfec6ecd91c9eea85a5
Commit Graph

19062 Commits

Author SHA1 Message Date
Razharas
93077ab2e3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-02 19:04:16 +03:00
Razharas
feb3d2adce Fixes comment 
Fixes comment
 2015-09-02 14:41:27 +03:00
Razharas
c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco 
Small changes to mobs on fire
 2015-09-02 14:38:20 +03:00
Razharas
e0e5bbc978 Merge branch 'DSStuff' of git://github.com/Steelpoint/-tg-station into Steelpoint-DSStuff 2015-09-02 14:38:07 +03:00
Razharas
92172265e3 Merge pull request #11396 from RemieRichards/DataStructures-Stacks&LinkedLists 
Datastructures: Stacks & Linked Lists
 2015-09-02 10:34:19 +03:00
Ergovisavi
bf69c85f71 Mobs on fire adjustments: 
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
 2015-09-01 22:04:10 -07:00
palpatine213
00f01159b1 Fixes Merge conflicts 2015-09-01 19:46:30 -07:00
Cheridan
a48bddb551 Merge pull request #11479 from AnturK/morefixes 
Wizard nuke steal and voodoo doll fixes
 2015-09-01 12:01:12 -05:00
Razharas
33ff21393d Merge pull request #11495 from Anonus/stopbombingtheblob 
Blob is now much more resistant to explosions.
 2015-09-01 18:37:33 +03:00
Razharas
93ca749785 Merge pull request #11478 from xxalpha/crawlinginmyskin 
Changed blood crawl to be a spell.
 2015-09-01 18:36:20 +03:00
Razharas
72404041e2 Merge pull request #11507 from MrStonedOne/patch-34 
Fixes reboot world in dd or client side debugging tools acting odd.
 2015-09-01 18:34:43 +03:00
Razharas
5bf8c9dae5 Merge pull request #11512 from Jordie0608/thefirststeptoanyunificationisnaturallystatistics 
Makes auto_declare_completion_ use printplayer()
 2015-09-01 18:34:27 +03:00
Razharas
ad9fa24d5f Merge pull request #11515 from xxalpha/PLmD_69pXpk 
Tweaked foam spread logic, foam layer.
 2015-09-01 18:33:22 +03:00
Razharas
9af4b4cf09 Merge pull request #11514 from bgobandit/boopbot 
Cleanbots, floorbots and MULEbots are no longer audible by deaf people.
 2015-09-01 18:30:29 +03:00
Aranclanos
87971f36c9 Merge pull request #11484 from spasticVerbalizer/swarmEmptyMessage 
Adds check for empty message in guardian communicate verbs
 2015-09-01 12:27:26 -03:00
Aranclanos
7d729e270b Merge pull request #11508 from Core0verload/spider 
Removes unused SpiderOS icons
 2015-09-01 12:25:56 -03:00
Aranclanos
7d96801475 Merge pull request #11480 from spasticVerbalizer/reinforceCheck 
Adds check whether floor has been reinforced before using rods
 2015-09-01 12:22:35 -03:00
Razharas
737ee58330 Merge pull request #10830 from xxalpha/HACKERS 
Made it possible to emag a cyborg more than once.
 2015-09-01 17:58:53 +03:00
xxalpha
a5062c812b Added emag cooldown. Added emag protection if cyborg slaved to tator AI. 2015-09-01 15:53:12 +01:00
xxalpha
75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin 
Conflicts:
	icons/mob/actions.dmi
 2015-09-01 15:39:15 +01:00
Razharas
c94085dcbe Merge pull request #11489 from Core0verload/turbine 
Fixes roundstart turbine spawning broken
 2015-09-01 17:39:03 +03:00
Razharas
72610973cc Merge pull request #11427 from xxalpha/magborg 
Gave engineering cyborgs permanent magboots effect.
 2015-09-01 17:31:15 +03:00
Razharas
9d6ce85e9a Merge pull request #11414 from Xhuis/shadowling_update_4 
Shadowling Update IV
 2015-09-01 17:19:07 +03:00
Razharas
6724e65aae Merge pull request #11270 from ExcessiveUseOfCobblestone/master 
Simple RnD tweaks
 2015-09-01 16:40:25 +03:00
Razharas
05281276be Merge pull request #11266 from Robustin/Tatertweak 
Increases Folder Exchange Trigger
 2015-09-01 16:31:24 +03:00
Razharas
1582526447 Merge pull request #11166 from GunHog/Sawumakesmewanttocry 
E.X.P.E.R.I-MENTOR fixes
 2015-09-01 16:06:58 +03:00
xxalpha
642406e6c9 Merge remote-tracking branch 'upstream/master' into HACKERS 2015-09-01 14:05:35 +01:00
Razharas
a1e74cb22d Merge pull request #11334 from oisin100/patch-2 
Realistic Trees
 2015-09-01 16:00:13 +03:00
Razharas
37556b1c1f Merge pull request #11491 from Aranclanos/ghostyelling 
Fixes ghost yelling, now the message will be displayed.
 2015-09-01 15:56:29 +03:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
Razharas
6464aafa7c Merge pull request #11494 from Aranclanos/PDAqdel 
Fixes PDAs being able to send messages to other PDAs in the qdel queue
 2015-09-01 15:53:26 +03:00
Razharas
752454e239 Merge pull request #11509 from Aranclanos/playerplanel 
Fixes the player panel not opening on clientless mobs
 2015-09-01 15:49:42 +03:00
Razharas
30ac2634f4 Merge pull request #11250 from GunHog/Malf_RCD-defense 
Buffs RCD Disable Malfunction ability
 2015-09-01 11:50:17 +03:00
Razharas
b2654acec5 Merge pull request #11247 from xxalpha/airlocking 
Airlock Overlays
 2015-09-01 11:49:05 +03:00
duncathan
1f5510eb12 hahah woops 2015-09-01 02:16:12 -06:00
Razharas
e69d8d312b Merge pull request #11232 from Miauw62/alanedaggerpoe 
Edaggers: Actually works edition
 2015-09-01 11:07:22 +03:00
Razharas
829a88816b Merge pull request #11179 from Dorsisdwarf/andtheyrelikeitsdeaderthanyours 
Makes lings undetectable to the AI when using digital camo
 2015-09-01 11:00:38 +03:00
Razharas
bf85a525e7 Merge pull request #11071 from PatchouliKnowledge/ayycidlockers 
Lockers dump their contents if molten by alien acid
 2015-09-01 10:58:10 +03:00
Razharas
8a6b41865e Merge pull request #10873 from ghost/chameleon 
Chameleon Eyewear
 2015-09-01 10:51:15 +03:00
Razharas
a898794ed1 Merge pull request #10922 from Miauw62/idedthenerfening 
ei nath nerfs 2: ayy lmao
 2015-09-01 10:34:54 +03:00
Razharas
305cbb644c Merge pull request #11288 from Robustin/AnnouncementsFix 
Fixes Announcements Garbling
 2015-09-01 10:29:58 +03:00
Razharas
446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor 
Cyborgs unlocking cover and AI unanchoring upon dying.
 2015-09-01 10:08:08 +03:00
Razharas
087758925f Merge pull request #11336 from Aranclanos/IactuallyHateThem 
Adds a happy greeting for my friends the admins who I love!
 2015-09-01 10:07:31 +03:00
Razharas
610905bb55 Merge pull request #11342 from Fox-McCloud/emitterboard 
Producible Emitter Boards at R&D
 2015-09-01 10:06:03 +03:00
Razharas
8cbfed09a5 Merge pull request #11346 from bgobandit/newsurgerytweaks 
New Ghetto Surgery Items: Non-Fucked Up Edition
 2015-09-01 10:04:25 +03:00
Razharas
cddb32f606 Merge pull request #11384 from Aranclanos/petemilking 
Fixes goat and cow milking, they were just simply not working.
 2015-09-01 10:02:27 +03:00
Razharas
7f14f8fedb Merge pull request #11410 from bgobandit/manifestpets 
Animals are now listed properly on cargo manifests.
 2015-09-01 09:59:13 +03:00
Razharas
e18032c87a Merge pull request #11411 from Xhuis/help_xenos_in_medbay_maint 
MEGA Toys presents: Xenos Isolated action figure!
 2015-09-01 09:58:15 +03:00
Razharas
3bf36ad9a6 Merge pull request #11475 from MrStonedOne/patch-33 
Changes gold slimes mob list to use initial() and only generate the mob list once.
 2015-09-01 09:54:31 +03:00
Razharas
4a4d46305f Merge pull request #11485 from AnturK/knockknock 
Makes knock spell open lockers/crates
 2015-09-01 09:52:02 +03:00