cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,803 Commits 61 Branches 14 Tags
c527491f413aaa4a45a2a097e7dc013eecf76d91
Commit Graph

4392 Commits

Author SHA1 Message Date
paprka
c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2015-02-05 17:44:22 -08:00
paprka
2ef8848c74 adds ability to store ammo and any type of revolver in holster 2015-02-05 17:41:10 -08:00
Cheridan
fdb9c92736 Merge pull request #7494 from paprka/dirsigns 
Adds directional signs from bay
 2015-02-05 16:28:26 -06:00
Swag McYolosteinen
6fab02e7cd Merge pull request #7546 from TZK13/Purple-Shorts 
Adds purple shorts
 2015-02-05 18:16:14 +01:00
Swag McYolosteinen
574fc61c83 Merge pull request #7543 from TZK13/Work-Boots 
Adds work boots for engineers
 2015-02-05 18:15:28 +01:00
Swag McYolosteinen
ac60a828f9 Merge pull request #7536 from Iamgoofball/chemblob 
fixes my shit
 2015-02-05 18:04:54 +01:00
Iamgoofball
2393380711 grenades now add up the temperature of contained beakers when mixing 2015-02-04 18:59:18 -08:00
paprka
6299c546ab fixes a runtime related to stacks 2015-02-04 18:05:45 -08:00
Swag McYolosteinen
2b195c1f2d Merge pull request #7512 from paprka/rodslel 
Rods now change sprite depending on how much in the stack
 2015-02-04 13:03:16 +01:00
Razharas
2edcbc5a08 Merge pull request #7526 from TheVekter/redbutton 
Adds red button toy to arcade machines
 2015-02-04 12:17:24 +03:00
TZK13
01bf5b343f Adds purple shorts. 2015-02-04 01:23:58 -06:00
TZK13
8400ec9800 Adds work boots and fixes character setup previews. 2015-02-04 00:32:15 -06:00
paprka
6648390bf5 Merge branch 'master' of https://github.com/tgstation/-tg-station into rodslel 
Conflicts:
	icons/obj/items.dmi
 2015-02-03 22:24:00 -08:00
paprka
495ae29ab8 helmet, armor, and corgi changes 2015-02-03 19:12:38 -08:00
paprka
0645d46168 iv drip hotfixes 2015-02-03 18:34:32 -08:00
Iamgoofball
a480ffbc98 whole lotta bugfixes 2015-02-03 17:57:57 -08:00
paprka
11463998e6 Merge branch 'master' of https://github.com/tgstation/-tg-station into dirsigns 2015-02-03 14:56:23 -08:00
Cheridan
5f884b6017 Merge pull request #7496 from dannno/killyoselfmyman 
Adds proper suicide messages to like a lot of stuff
 2015-02-03 16:43:09 -06:00
Cheridan
80913f143b Merge pull request #7239 from paprka/ointmentandshit 
BLOOD FOR THE BLOOD GOD
 2015-02-03 16:30:42 -06:00
Cheridan
784766e8cc Merge pull request #7509 from paprka/gunstuff 
Improves pulse guns, ERT, and centcomm areas
 2015-02-03 16:14:48 -06:00
paprka
890b3800e6 some clothing changes 2015-02-03 09:00:51 -08:00
TheVekter
de0175bfee Blargh removed commented code I'm fuckin' tired 2015-02-03 08:37:48 -06:00
TheVekter
9bf58de009 Added red button 2015-02-03 08:25:50 -06:00
hornygranny
bbfad5b137 Merge pull request #7488 from paprka/memetiersprioite 
fixes janicart
 2015-02-02 19:37:28 -08: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
dannno
d8823a8038 Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman 2015-02-02 19:30:24 -05:00
dannno
c18f485b17 fix shit, make bible suicide sacrifice you to your deity 2015-02-02 15:13:17 -05: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
f4cd2cd4af fixes ert access 2015-02-02 06:22:07 -08:00
paprka
18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka
50e152f402 rods 2015-02-02 00:20:22 -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
dannno
c48bf44a47 framework for a future "suicide hotline" job 2015-02-01 19:44:54 -05: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
paprka
95e4cf1ffa adds directional signs from bay 2015-02-01 06:13:21 -08:00
paprka
77dabb02fe fixes janicart 2015-02-01 03:09:09 -08:00
paprka
d6dce069f4 finally actually fixes the blood decals 2015-02-01 00:29:37 -08:00
paprka
0b64a23310 fixes blood drips 2015-01-31 23:40:27 -08:00
paprka
ce65ad8c62 fixes some gauze inconsistencies 2015-01-31 23:27:23 -08:00
paprka
1ce5722eac map conflicts and other changes 2015-01-31 23:14:12 -08: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
Remie Richards
b1ff5dd6de Merge pull request #7418 from paprka/kekwalk 
Some catwalk fixes
 2015-02-01 03:32:43 +00:00
Remie Richards
c09bd7707b Merge pull request #7435 from dannno/dufflefix 
fixes dufflebag max weight class
 2015-01-31 19:49:37 +00:00
paprka
453a3db196 etc 2015-01-30 23:18:02 -08:00
Incoming
c8e3b33687 (｡´>д<)っ彡☆ 
Y'all making me do actual refactoring in a silly pull
 2015-01-29 18:59:25 -05:00
Incoming
b5ec328983 New contraband supply item: 50 butterflies 
(◕‿◕✿)
 2015-01-29 18:07:34 -05:00
dannno
d47f6334c3 fixes dufflebag max weight class 2015-01-29 16:05:33 -05:00
Swag McYolosteinen
3bb7213d14 Merge pull request #7346 from paprka/hoodshit 
New hood/hardsuit helmet system
 2015-01-29 18:57:25 +01:00