cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,279 Commits 61 Branches 14 Tags
82a7beb02c1935ec171dadbb1b4eddbc9450334b
Commit Graph

1123 Commits

Author SHA1 Message Date
hornygranny
7b8a8a3308 Merge pull request #7870 from phil235/WindowFormattingFix 
Two window fixes
 2015-02-22 20:18:21 -08:00
Swag McYolosteinen
96e7a5c473 Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver 
Warning check before sorting long lists in vv
 2015-02-22 11:57:01 +01:00
phil235
19e3cd5d1e Fixes a window's size and a colored text in another one. 2015-02-21 16:24:13 +01:00
Jordie0608
5a3d9d883f Warning check before sorting long lists in vv 2015-02-21 21:46:42 +11:00
GunHog
cd00e07f4f Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor 
Conflicts:
	code/modules/research/experimentor.dm
 2015-02-20 15:23:07 -06:00
GunHog
1cd892a0fd Experimentor Invesigate Take 1 
- Logs lots of the things to experimentor investigate.
 2015-02-20 15:09:59 -06:00
phil235
ce1ae70d1a Merge pull request #7723 from Miauw62/welpwelp 
Fixes walls becoming nondense due to adminteleport.
 2015-02-17 14:28:03 +01:00
Swag McYolosteinen
18a344e66b Update adminjump.dm 2015-02-17 13:44:21 +01:00
phil235
a62c0333d6 Merge pull request #7685 from optimumtact/destructnuke 
Nuclear self destruct option with added centcomm fun
 2015-02-16 23:09:29 +01:00
Cheridan
1ad51c8201 Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-02-14 23:16:02 -06:00
oranges
bae27bc40b Allow station self destruct with captains identity card 2015-02-15 12:09:09 +13:00
Swag McYolosteinen
e0f82d960a removes incorporealmove things 2015-02-14 18:39:16 +01:00
Swag McYolosteinen
f9b962fd47 Fixed #7594, walls becoming nondense due to adminteleport. 2015-02-14 12:00:04 +01:00
Sometinyprick
ce8d3e32b6 Update diagnostics.dm 2015-02-13 17:30:52 +00:00
Sometinyprick
98edcffb7d oops 2015-02-13 17:29:22 +00:00
Sometinyprick
2cbff9e2dd admins are thing 
thing of admins
 2015-02-13 17:00:51 +00:00
Cheridan
0db4c09326 Merge pull request #7573 from xxalpha/schizo 
Hear the voice of the chosen deity in your head.
 2015-02-11 09:52:05 -06:00
Swag McYolosteinen
f130872f4e Merge pull request #7517 from RemieRichards/MovableUIElements 
Movable UI Elements!
 2015-02-10 17:50:33 +01:00
Kraseo
80191947e2 ERT now spawn with random names because cheri hates fun 2015-02-09 20:10:29 +01:00
Kraseo
08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
xxalpha
e894fdc6c1 You will hear the voice of the chosen god in your head. 
Remove text macros
 2015-02-06 00:54:35 +00:00
Remie Richards
6290462c20 Adds Debug verbs for Movable and Snap UI Elements (R_DEBUG Admin rank required) 2015-02-03 22:38:45 +00:00
Cheridan
80913f143b Merge pull request #7239 from paprka/ointmentandshit 
BLOOD FOR THE BLOOD GOD
 2015-02-03 16:30:42 -06:00
paprka
6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 
Conflicts:
	_maps/map_files/generic/z2.dmm
 2015-02-02 19:13:49 -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
paprka
e4262d21a5 nanite injector for med ert 2015-02-02 06:24:16 -08:00
paprka
d232086ff5 small bandaid fix 2015-02-02 03:54:24 -08:00
paprka
18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka
a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00
paprka
55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08: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
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
paprka
a661e58281 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-31 22:03:00 -08:00
paprka
453a3db196 etc 2015-01-30 23:18:02 -08: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
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
Steelpoint
18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08: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
paprka
e507cd31d8 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 2015-01-27 17:12:59 -08: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
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
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
paprka
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
Deantwo
6bed1a71ce View Own Notes Readabily Fix 
Adds a line brreak ("<br>") after each note.
 2015-01-25 10:46:27 +01:00
paprka
a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00