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
17,649 Commits 61 Branches 14 Tags
de0175bfee44d42ac100de7a35bebd359fe25fb4
Commit Graph

7747 Commits

Author SHA1 Message Date
hornygranny
6068fb4162 Merge pull request #7455 from Iamgoofball/patch-25 
Fixes #7258
 2015-02-02 18:32:02 -08:00
Swag McYolosteinen
9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage 
Repath all non jetpack tank types to tank/internals
 2015-02-02 18:52:51 +01:00
Razharas
106fbf6347 Merge pull request #7487 from paprka/voxtest 
Removes voxtest 2, removes /tg/ culture
 2015-02-02 15:02:27 +03:00
Cheridan
f8bb02d54a Merge pull request #7422 from Steelpoint/ERTBalance2 
ERT Balance Pass 2 | ERT Access and Foam
 2015-02-01 20:16:04 -06:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
Swag McYolosteinen
920bca9147 Merge pull request #7358 from Delimusca/gooeyfun 
Minor slime enhancements
 2015-02-01 14:04:52 +01:00
Swag McYolosteinen
ad8898d154 Merge pull request #7406 from Menshin/send_back_to_lobby 
Added a "Send back to Lobby" option in Player Panel
 2015-02-01 12:50:55 +01:00
Swag McYolosteinen
d5ccc9cffe Merge pull request #7436 from Incoming5643/WaitingForTheSun 
Fixes #6885
 2015-02-01 12:46:16 +01:00
paprka
e4b52c3974 removes voxtest 2 2015-02-01 02:11:42 -08:00
Razharas
c0abee10a3 Merge pull request #7462 from Iamgoofball/patch-26 
Fixes #7458
 2015-02-01 10:26:08 +03:00
Razharas
452494aaa4 Merge pull request #7452 from Iamgoofball/patch-22 
Fixes #7409
 2015-02-01 10:06:46 +03:00
Iamgoofball
fa7ac922f9 changes to isliving() 2015-01-31 10:21:44 -08:00
Iamgoofball
77562ab06a Fixes #7458 
Fixes #7458
 2015-01-30 22:23:57 -08:00
Iamgoofball
7bf38b41f7 Fixes #7258 
Fixes #7258
 2015-01-30 16:47:40 -08:00
Iamgoofball
920c730b8e Fixes #7409 
Fixes #7409
 2015-01-30 16:09:55 -08:00
phil235
b4324a2db4 Fixes typo in CPR logs that switched attacker and victim. 2015-01-30 22:16:48 +01:00
Cheridan
2716046e09 Merge pull request #6817 from Perakp/speed_tweak 
Cold temperatures slow you down even when there is no gravity.
 2015-01-30 14:45:27 -06:00
Cheridan
9eb4e67d58 Merge pull request #7412 from paprka/capwazer 
adds unique inhands for the captain's laser
 2015-01-30 14:07:12 -06:00
Incoming
31b84ca71f changes how the bolt of door creation works so it behaves expectedly on shuttles 
adds butterflies to the staff/wand of change/polymorph since I'm here.

Removes two colons
 2015-01-29 16:30:31 -05:00
hornygranny
f7659eb4e5 Merge pull request #7426 from Miauw62/ye_olde_bugfix 
fixes MMI and pAI teleporting
 2015-01-29 10:51:12 -08:00
Swag McYolosteinen
eafdaae185 Merge pull request #7393 from GunHog/WhyDidYouBorgTheClown 
More Silicon Emotes!
 2015-01-29 19:06:19 +01:00
Swag McYolosteinen
3bb7213d14 Merge pull request #7346 from paprka/hoodshit 
New hood/hardsuit helmet system
 2015-01-29 18:57:25 +01:00
Miauw
b6b17e214f After-merge cleanup. 2015-01-29 18:51:31 +01:00
Miauw
e1d3799f9d Removes a debug message. 2015-01-29 18:50:51 +01:00
Miauw
04ad06eca0 Fixed #126. MMIs and pAIs can now be teleported properly. 
Revamped the AI get/jump procs to use admin_forcemove(), which makes sure that mobs are moved by setting various vars and then calling Move().
 2015-01-29 18:50:48 +01:00
Swag McYolosteinen
ea7c58e4a0 Merge pull request #7403 from Deantwo/ChemDispUiFix 
Chemical Dispenser and ChemMaster fixes
 2015-01-29 18:42:25 +01:00
Steelpoint
18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
paprka
e5b4a32cc4 adds unique inhands for the captain's laser 2015-01-28 16:37:03 -08:00
GunHog
2920aa3aa9 Adds the new emotes to the help emote display. 2015-01-28 16:39:25 -06:00
hornygranny
02630dcb45 Merge pull request #7379 from Menshin/jump_to_area_fix 
Jump_to_area bugfixing
 2015-01-28 14:33:59 -08:00
Menshin
9af151878d Added a "Send back to Lobby" option in Player Panel. 2015-01-28 18:45:26 +01:00
Deantwo
ca8d9b1f0e Added GoonChems 
- Added GoonChems to the constructable/Portable Chem Dispenser. Note
that they are not added with balance in mind.
 2015-01-28 14:58:06 +01:00
Swag McYolosteinen
ed33b05ab3 Merge pull request #7384 from Cheridan/original_functionality 
Fixes firing pins replicating original lockbox anti-melee functionality.
 2015-01-28 14:45:43 +01:00
Swag McYolosteinen
d2f2a8a2bd Merge pull request #7381 from phil235/AIPicturePrintTypo 
Fixes typo in AI picture printing message
 2015-01-28 14:45:04 +01:00
Deantwo
4f109beeb7 Added Chem/CondiMaster cancel buttons 
- Made all the text input fields use stripped_input.
- Made checks for null input to call return.
- Number inout can now also return 0 so you can cancel it.
- Added the default text to a bottle with no reagents " ", so you can
still dispense empty bottles.
- Trimmed all named. Mostly so empty bottles aren't called " bottle".
 2015-01-28 13:43:31 +01:00
paprka
38e038a0d8 final fixes to hardsuits 2015-01-27 17:26:53 -08:00
paprka
9c21cf5d42 fixes and such 2015-01-27 17:16:42 -08:00
paprka
e507cd31d8 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 2015-01-27 17:12:59 -08:00
GunHog
5da386c2ad New Silicon Emotes! 
Adds the following emotes, all audible:
- buzz2
- chime (MULEbot delivery chime)
- honk, with the pitch variation of the standard bike horn!
- sad, the sad trombone sound from HONK mechs!
- warn, the warning buzzer from newscasters and disposal shutes

I also set the other audible emotes to audio message type.
 2015-01-27 12:51:18 -06:00
Swag McYolosteinen
58648d267e Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas 
Shuttle Stranding
 2015-01-27 17:55:26 +01:00
Deantwo
757a3aa810 Removes duplicate fluorine 
from dispensable_reagents
 2015-01-27 16:00:53 +01:00
paprka
b830f77ea2 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-26 15:37:33 -08:00
Cheridan
b28d1773a3 Fixes firing pins replicating original lockbox anti-melee functionality. 2015-01-26 16:23:25 -06:00
Swag McYolosteinen
7b8e2cd0c6 Merge pull request #7109 from Xhuis/whydidthisnotexistanywayfuckingchrist 
Gives Syndicate cyborgs an operative pinpointer module
 2015-01-26 20:18:41 +01:00
Swag McYolosteinen
8023756ef8 Merge pull request #7342 from Ikarrus/falsealarm 
False Alarm Event Tweaks
 2015-01-26 20:16:49 +01:00
Swag McYolosteinen
d73b83f70f Merge pull request #7352 from Deantwo/BrBreaks 
View Own Notes Readabily Fix
 2015-01-26 20:16:13 +01:00
phil235
e159cf0498 Fixes typo in the message the AI gets when attempting to print a picture when it has none. 2015-01-26 20:06:07 +01:00
Swag McYolosteinen
be26c22e74 Merge pull request #7320 from GunHog/IFixedItForSCIENCE 
Fixes the E.X.P.E.R.I-MENTOR and related reagent runtime
 2015-01-26 19:30:29 +01:00
GunHog
0a3ffd8f19 Complete fix for reagent runtimes 
The proc was simply used incorrectly. Replaces "=" with ","
 2015-01-26 12:25:20 -06:00
Menshin
1534c82240 * Build the area list at world startup 
* Fix the station areas not being processed in the jump_to_area proc
 2015-01-26 19:09:05 +01:00