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,704 Commits 61 Branches 14 Tags
7903aba6d30a2b20782cd2aaecb41a1b2c8f3b75
Commit Graph

2605 Commits

Author SHA1 Message Date
paprka
0645d46168 iv drip hotfixes 2015-02-03 18:34:32 -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
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
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
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
paprka
453a3db196 etc 2015-01-30 23:18:02 -08: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
Swag McYolosteinen
697c79e99c Merge pull request #7387 from Delimusca/foamfun 
foam armblade toy
 2015-01-29 18:28:58 +01:00
Steelpoint
18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
Delimusca
3e796d843b fixed foam armblade name 2015-01-28 18:22:13 -07:00
Cheridan
46f588b424 Merge pull request #7334 from Xhuis/portable_console_in_belt 
Lets you store handheld crew monitors in medical belts
 2015-01-28 09:41:04 -06:00
Cheridan
1c81aa37a9 Merge pull request #7330 from Menshin/variables_clusterbangs 
Ported the variable payload clusterbangs from sayustation
 2015-01-28 09:25:50 -06:00
Delimusca
a00714f140 added foam armblade 2015-01-26 18:06:42 -07: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
paprka
cc94e4eb9c changelog and nerf 2015-01-26 03:58:23 -08:00
paprka
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
paprka
d9f49a4eb5 colon and locate() for blood 2015-01-25 16:53:12 -08:00
Remie Richards
f7730eeaef Merge pull request #7087 from paprka/readdjanikart 
Improves janicart and adds secway
 2015-01-26 00:31:30 +00:00
Swag McYolosteinen
39a9283592 Merge pull request #7329 from Deantwo/PencodeAftermath 
Pencode aftermath changes
 2015-01-25 18:40:35 +01:00
paprka
a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00
Xhuis
87dc5bafdd Fixes error 2015-01-24 17:00:56 -05:00
Xhuis
266acdaac5 Lets you store handheld monitors on medbelts 2015-01-24 16:48:27 -05:00
Deantwo
0e8156814f Font Define'ers Renamed 
- Renamed font define'ers.
- Removed font duplicate define'ers.
 2015-01-24 17:32:17 +01:00
Menshin
882b05f287 0-day fixes 2015-01-24 16:52:01 +01:00
Swag McYolosteinen
50e927ea33 Merge pull request #7314 from paprka/holster 
fixes holster weight class
 2015-01-24 16:48:05 +01:00
Menshin
8f10dea61a Ported the variable payload clusterbangs from sayustation. 2015-01-24 16:36:30 +01:00
Deantwo
bfea67611e Pencode Changes Cleanup 
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
 2015-01-24 16:07:13 +01:00
Swag McYolosteinen
af15be9bee Merge pull request #7287 from Deantwo/PencodePdaNotekeeper 
PDA Notekeeper 2.2
 2015-01-24 14:15:27 +01:00
Swag McYolosteinen
d26e40a6ee Merge pull request #7282 from Firecage/SkinningMonkeysXenos 
Adds the ability to remove monkey/xeno skins and make costumes with them
 2015-01-24 14:06:13 +01:00
paprka
279c2709d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-24 01:40:51 -08:00
paprka
f071655ea4 updates and optimizations 2015-01-24 01:12:57 -08:00
Cheridan
8dfaed5fe4 Merge pull request #6871 from fleure/syndiebux 
Adds briefcase with cash to uplink
 2015-01-23 22:24:50 -06:00
Cheridan
3d9cf1dc81 Merge pull request #7242 from drynwyn/PAYDAY 
Payday Guns Bundle (Adds gloves, clown mask, suit to the guns syndicate bundle)
 2015-01-23 21:52:46 -06:00
Cheridan
1428a5a16d Merge pull request #7290 from Iamgoofball/goonchem_shoehorn_backup 
Fixes the font issues, removes 3 mutations R.I.P
 2015-01-23 21:39:42 -06:00
tkdrg
cb55d4533d Merge pull request #7179 from Firecage/Violin_hit 
Adds sound effect to hitting with violin.
 2015-01-23 22:15:13 -03:00
paprka
30348d8cdd Merge branch 'master' of https://github.com/tgstation/-tg-station into holster 
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
 2015-01-23 16:48:30 -08:00
paprka
f487b70b65 fixes holster weight class 2015-01-23 16:47:00 -08:00
Swag McYolosteinen
6094240b5a Merge pull request #7246 from dannno/dufflebags 
Fannypacks and Dufflebags
 2015-01-23 20:06:26 +01:00