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

1064 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
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
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
495ae29ab8 helmet, armor, and corgi changes 2015-02-03 19:12:38 -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
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
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
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
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
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
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
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
paprka
ac85775b02 catwalk fixes 2015-01-28 19:30:21 -08: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
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -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
paprka
a5a9e297d4 new hood system 2015-01-25 00:22:52 -08: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
be925ebd62 adds a check for the buffer upgrade 2015-01-24 01:49:07 -08: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
Swag McYolosteinen
6094240b5a Merge pull request #7246 from dannno/dufflebags 
Fannypacks and Dufflebags
 2015-01-23 20:06:26 +01:00
Steelpoint
217809bab6 Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015 
Conflicts:
	icons/mob/uniform.dmi
 2015-01-24 01:11:14 +08:00
Swag McYolosteinen
ac8d96af0b Merge pull request #7171 from tkdrg/nicebush 
Fixes ppgrass ausbush having wrong icon_state
 2015-01-23 17:27:14 +01:00
dannno
9fd1c313d0 resolve conflicts 2015-01-23 01:36:58 -05:00
dannno
28e40fa2be probability for dufflebag spawns in personal lockers. 2015-01-23 01:29:55 -05:00
dannno
28bff00e6a removes 2 syndie bags, removes slowdown from syndie bags 2015-01-22 23:49:14 -05:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +08:00
Firecage
3836f7a30a Spike skinned == -> >= 2015-01-22 20:13:27 +02:00
Firecage
b621d94be8 #DEFINES for skinning spike 2015-01-22 19:42:42 +02:00
Firecage
2228b443a7 Adds the ability to remove monkey/xeno skins and make costumes with them 2015-01-22 15:17:22 +02:00
Steelpoint
e63c805494 FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns 2015-01-22 16:47:01 +08:00
paprka
d874ca7f5f Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart 2015-01-21 18:28:52 -08:00
paprka
0f6122ce0e remove copypaste 2015-01-21 16:55:38 -08:00
paprka
8e288e367c Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 
Conflicts:
	code/game/objects/items/weapons/storage/firstaid.dm
 2015-01-21 15:19:32 -08:00
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00
tkdrg
11f3717771 Merge pull request #7162 from Firecage/monkey_dexterity_message 
Gives the monkey dexterity message to some stuff.
 2015-01-21 15:35:29 -03:00
Firecage
a93a1dfe36 usr -> user in monkey dexterity. 2015-01-21 19:57:48 +02:00
Steelpoint
e5d04ba418 SecSprites2015 2015-01-21 23:07:15 +08:00