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,412 Commits 61 Branches 14 Tags
8dfaed5fe453d89db03cb9771fb705e08522e8a0
Commit Graph

13994 Commits

Author SHA1 Message Date
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
Cheridan
c0e2bc45bf Merge pull request #7213 from Iamgoofball/patch-11 
Allows Space Cleaner to clean off Colorful Reagent effects
 2015-01-23 21:20:34 -06:00
Iamgoofball
e43ba66e0f Update Chemistry-Reagents.dm 2015-01-23 19:13:49 -08:00
Cheridan
e8a32e22a8 Merge pull request #7244 from Ikarrus/accessthreshold 
Automatic Round-start Access Scaling
 2015-01-23 20:47:27 -06:00
Razharas
709b6c8a33 Merge pull request #7278 from sawu-tg/expexpanded2 
Changes/Fixes/Features to the Experimentor
 2015-01-24 05:30:19 +03: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
Ergovisavi
cdc1a3194a Merge pull request #7095 from Miauw62/assthecopying 
Makes photocopiers less exploitable.
 2015-01-23 13:44:18 -08:00
Swag McYolosteinen
6094240b5a Merge pull request #7246 from dannno/dufflebags 
Fannypacks and Dufflebags
 2015-01-23 20:06:26 +01:00
Sawu
ec31f83813 Fixes a missed span 2015-01-24 05:32:51 +11: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
5e55d4e096 Merge pull request #7141 from Firecage/floor_tile_fix 
A fix so mineral floor tiles can be reshaped into mineral sheets.
 2015-01-23 17:53:49 +01:00
Swag McYolosteinen
16c424af6c Merge pull request #7206 from phil235/CargotechJumpsuitSpriteFix 
Fixes cargotech jumpsuit onmob sprite
 2015-01-23 17:50:34 +01:00
Swag McYolosteinen
d19f48fe15 Merge pull request #7265 from Firecage/ProtoSMGpin 
Fixes proto SMG having a firing pin.
 2015-01-23 17:48:21 +01:00
Swag McYolosteinen
fdb0fd330c Merge pull request #7102 from tkdrg/thxobama 
Fixes mining borg jetpack
 2015-01-23 17:46:40 +01:00
Swag McYolosteinen
7a05b943ed Merge pull request #7180 from Firecage/nanites_to_nanomachines 
This changes the robotics transformation nanites ID to nanomachines
 2015-01-23 17:46:17 +01:00
Swag McYolosteinen
f0294fa3b4 Merge pull request #7266 from Firecage/Ore_redemtion_machine 
Fixes ore redemption machine screwdrivering
 2015-01-23 17:45:14 +01:00
Swag McYolosteinen
c8a6b3d331 Merge pull request #7267 from RemieRichards/SyndiBorgAccess 
Fixes Syndiborg Lock/Cover Access
 2015-01-23 17:44:46 +01:00
Swag McYolosteinen
4fda850ddf Merge pull request #7255 from Menshin/HE_fix 
Fixed HE junctions badly initializing directions
 2015-01-23 17:40:51 +01: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
Swag McYolosteinen
10ea66cb6b Merge pull request #7164 from Steelpoint/ERTBalanceV1 
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
 2015-01-23 17:16:33 +01:00
dannno
9fd1c313d0 resolve conflicts 2015-01-23 01:36:58 -05:00
Ikarrus
b63d511d42 Automatic toggle no longer removes sec/assmaint if their options are toggled on in the game options config. It will still grant these accesses if the threshold is not reached. 2015-01-22 23:36:25 -07:00
dannno
28e40fa2be probability for dufflebag spawns in personal lockers. 2015-01-23 01:29:55 -05:00
Firecage
d8b99bbab1 Merge conflict fix 2015-01-23 07:52:24 +02:00
tkdrg
7df272f3d6 Merge pull request #7128 from Jordie0608/timeforanewnew() 
Reagent container spawning refactor
 2015-01-23 02:38:42 -03:00
tkdrg
abc78fbba1 Merge pull request #7177 from Menshin/disposals_cleaning_part2 
Disposals cleaning/fixing part 2
 2015-01-23 02:26:30 -03:00
dannno
28bff00e6a removes 2 syndie bags, removes slowdown from syndie bags 2015-01-22 23:49:14 -05:00
Jordie0608
468557c5b7 whoops 2015-01-23 14:19:01 +11:00
Jordie0608
26161659c5 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() 
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
 2015-01-23 14:11:38 +11:00
Iamgoofball
de12010e31 Fixes the font issues, removes 3 mutations R.I.P 2015-01-22 17:28:13 -08:00
hornygranny
f2f7ee616d Merge pull request #7235 from Pennwick/master 
Fixes issue #7234 addiction bug
 2015-01-22 17:06:57 -08:00
hornygranny
22e96d3377 Merge pull request #7277 from pudl/chemfix 
replaces all instances of pacid with facid
 2015-01-22 17:06:46 -08:00
tkdrg
cc11078fa7 Merge pull request #6892 from Lo6a4evskiy/Food_cart 
Food cart
 2015-01-22 17:19:50 -03:00
tkdrg
0f501ba843 Merge pull request #7209 from Menshin/onCentcom_fix_fix 
onCentcom() fix... fix
 2015-01-22 16:08:58 -03:00
Steelpoint
399524dd36 MoreMoreRefinements 2015-01-23 03:06:12 +08:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +08:00
Steelpoint
0a82231f0c AccessRefinement 2015-01-23 01:54:20 +08:00
Swag McYolosteinen
b44956df86 Merge pull request #7191 from paprka/ebowfix 
fixes ebow and KA breaking once emp'd
 2015-01-22 18:04:08 +01:00
Lo6a4evskiy
2eeaec6168 Merge remote-tracking branch 'upstream/master' into Food_cart 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-22 12:55:01 +04:00
Steelpoint
e63c805494 FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns 2015-01-22 16:47:01 +08:00
Lo6a4evskiy
9edb727615 Make reagent_container/New take a volume argument 2015-01-22 12:34:17 +04:00
Firecage
72af5ffb8f Did what HG said to do with Protosmg firing pin 2015-01-22 08:08:14 +02:00
Sawu
6e1a292328 Fixed incorrect span 2015-01-22 15:30:35 +11:00
Jordie0608
f535abcc06 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() 
Conflicts:
	code/modules/food&drinks/food/snacks_burgers.dm
	code/modules/food&drinks/food/snacks_cake.dm
	code/modules/food&drinks/food/snacks_pastry.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-01-22 15:15:17 +11:00
Sawu
21edbc1f6f Changes/Fixes/Features to the Experimentor 
* Fixes #7224
* Re-fixes #7272
* Adds relics that spawn around the station, can be researched for randomised objects.
* Adds the meteor malfunction.
 2015-01-22 14:01:02 +11:00
pudl
c6b488a7c0 fixes up stuff i missed 2015-01-21 20:28:26 -06:00
pudl
08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06:00
Nienhaus
3733c4ff48 Merge pull request #7230 from paprka/painigga 
Adds walterje's pais
 2015-01-21 19:51:19 -06:00