cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,405 Commits 61 Branches 14 Tags
8a28571d83ea1f2b623e50d3539b9da8f1dc2e33
Commit Graph

7639 Commits

Author SHA1 Message Date
Iamgoofball
8a28571d83 fixes more runtimes 2015-01-24 18:31:59 -08:00
Iamgoofball
d886d38cc6 Fixes more runtimes with the experimentor 2015-01-24 08:36:15 -08:00
Iamgoofball
b329516181 fixes some incorrect chemicals 2015-01-23 21:13:33 -08:00
GunHog
40fe50d8e9 Fixes the E.X.P.E.R.I-MENTOR 
The "FAIL" define was set equal to the "SCANTYPE_DISCOVER" define,
resulting in the machine thinking everything was a relic and calling a
nonexistant reveal() proc on it.
 2015-01-23 22:08:33 -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
Ergovisavi
cdc1a3194a Merge pull request #7095 from Miauw62/assthecopying 
Makes photocopiers less exploitable.
 2015-01-23 13:44:18 -08: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
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
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
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
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
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
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
Steelpoint
399524dd36 MoreMoreRefinements 2015-01-23 03:06:12 +08:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +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
Remie Richards
a8b730c4c3 Fixes Syndicate borgs requiring Robotics access to open their locks, instead of Syndicate access 2015-01-21 22:08:40 +00:00
Firecage
8e93e028e4 Fixes ore redemption machine screwdrivering 2015-01-21 23:53:11 +02:00
Firecage
d18511eb72 This removes the firing pin from the Prototype SMG, and adds the standard firing pin to its children where they need it. 2015-01-21 23:33:49 +02:00
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00
tkdrg
d6e4b95ee0 Merge pull request #7176 from Carn/#7167 
Resolves #7167 - Redone shuttle corners on zlevel 2, yet again
 2015-01-21 16:20:19 -03:00
tkdrg
a274303404 Merge pull request #7006 from Incoming5643/hot_wiz_on_wiz 
Magic Mania 1.84 Antag hud system for wizards
 2015-01-21 15:34:25 -03:00
pudl
87fbe41f94 temporarily adds charcoal to the itching powder formula 2015-01-21 11:58:34 -06:00
pudl
21211a591b -adds mannitol to braincake and brainburgers 
-adds omnizine to warm donk pockets
 2015-01-21 11:49:55 -06:00
Swag McYolosteinen
c1edbb3ffc Merge pull request #7238 from pudl/chemstuff2 
goonchem fixes take 2
 2015-01-21 17:27:04 +01:00
Steelpoint
e5d04ba418 SecSprites2015 2015-01-21 23:07:15 +08:00
Swag McYolosteinen
507cbcabd4 Merge pull request #7123 from GunHog/AI_Loves_Her_Borgies 
Adds Cyborg data to AI's status screen
 2015-01-21 15:46:18 +01:00
Swag McYolosteinen
0576c2203e Merge pull request #7198 from Deantwo/PaperCut 
Paper Input Box Fix
 2015-01-21 15:44:03 +01:00
Deantwo
ec49b6d724 Paper Name Limit 
- Added arguments to the stripped_input call.
-- usr, no idea why it worked without this.
-- MAX_NAME_LEN, so you can't make paper with super long names.
 2015-01-21 13:13:13 +01:00
Jordie0608
6140a61de7 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() 
Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm
 2015-01-21 20:25:45 +11:00
tkdrg
13a7d6d61b Merge pull request #7173 from Carn/#6971 
Resolves #6971 - non-lighting_subarea areas are now stored in list/sorte...
 2015-01-21 05:06:25 -03:00