cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,162 Commits 61 Branches 14 Tags
8a61d11e2e593ecfca1bc154df795ada301ef09c
Commit Graph

2483 Commits

Author SHA1 Message Date
Iamgoofball
bc9d48fa42 Mutadone and Mannitol, tweaks and changes. 2015-01-16 19:28:13 -08:00
Iamgoofball
35cc6e3c54 Replaces pathing. 2015-01-16 18:21:01 -08:00
Iamgoofball
38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball
f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
Remie Richards
c08e4e4332 Merge pull request #7084 from JJRcop/ChronOPS 
Adds Chronosuit and T.E.D
 2015-01-17 01:02:52 +00:00
Sawu
87881ffb94 Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-17 09:55:12 +11:00
tkdrg
ac3c413f24 Merge pull request #6969 from Firecage/Biogenerator_stuff 
Adds stuff to Biogenerator. STUFF!.
 2015-01-16 17:31:25 -03:00
JJRcop
8fecbe2318 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS 
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/projectiles.dmi
 2015-01-16 14:09:07 -05:00
paprka
eae84c1c39 further conflicts and bugfixes 2015-01-15 21:59:36 -08:00
paprka
ab7d50c90e Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
 2015-01-15 21:56:23 -08:00
Cheridan
63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
JJRcop
31ebd43b18 Fixes issues with the chronosuit and TED. 
Removes unneeded vars from TED.
Re-adjusts armor values for chronosuit
 2015-01-15 13:32:21 -05:00
JJRcop
f34afaa3c9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS 
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi
 2015-01-15 02:30:31 -05:00
JJRcop
4c8f890f88 Adds Timeline Eradication Device 2015-01-15 02:18:04 -05:00
phil235
884e2a6f73 Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message. 2015-01-14 18:00:17 +01:00
Sawu
0de72483bc Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-14 18:35:29 +11:00
tkdrg
82bff079c7 Merge pull request #6137 from Iamgoofball/byond 
Goon Chemistry [FINISHED]
 2015-01-14 02:31:56 -03:00
paprka
8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 
Conflicts:
	icons/mob/head.dmi
 2015-01-14 11:25:07 +08:00
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz 
Replaces a bunch of input() with stripped_input()
 2015-01-13 19:32:25 +01:00
Cheridan
c81eada938 Merge pull request #6737 from tkdrg/hurr 
Changes the practice beam name to "practice laser"
 2015-01-13 02:13:38 -06:00
Steelpoint
1a0cc48566 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 
Conflicts:
	icons/obj/gun.dmi
 2015-01-13 15:32:28 +08:00
Cheridan
4bd70b2908 Merge pull request #6986 from Menshin/ear_damage_ooping 
Ear damage/deafness tidying
 2015-01-13 01:19:56 -06:00
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
Iamgoofball
5a91ce4fee Requested changes by @Cheridan 2015-01-12 20:38:56 -08:00
Cheridan
f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Cheridan
03e1d0d60a -Adds firing pin box define 
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
 2015-01-12 21:21:34 -06:00
Iamgoofball
f527d53e3e Increases the cigarette chemical cap as per request by @Miauw62 2015-01-12 19:01:52 -08:00
Menshin
435ccf7ff9 * OOP'ed ear damages/deafness status updating 
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
 2015-01-13 00:40:46 +01:00
tkdrg
379b7b83fc Fixes a missed variable 2015-01-11 20:00:41 -03:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input() 
Some of these were exploitable for XSS, as well.
 2015-01-11 19:02:53 -03:00
Firecage
c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00
tkdrg
1218610f75 Merge pull request #6847 from Razharas/GenFixes 
Fixes bugs caused by datum mutations
 2015-01-11 16:14:03 -03:00
Iamgoofball
493dd27679 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond 
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm
 2015-01-11 09:53:49 -08:00
Firecage
2e20b8ea91 Biogenerator stuff. 2015-01-11 16:53:41 +02:00
Swag McYolosteinen
cd3e08f624 Merge pull request #6942 from lolnon/transfer_valve_kek 
Fixes some functional but kekworthy code in transfer_valve.dm
 2015-01-11 12:22:32 +01:00
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
Razharas
a6ae15215a Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes 2015-01-11 08:48:03 +03:00
tkdrg
0f19537c2d Merge pull request #6721 from phil235/CargoCrateNameFix 
Many typo fixes
 2015-01-10 20:11:13 -03:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Sawu
7097887851 Americanised the Manual 
Changes spelling to the appropriate (American) locale.
 2015-01-10 23:28:41 +11:00
Swag McYolosteinen
404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam 
[FEATURE] Emergency Response Team
 2015-01-10 10:10:59 +01:00
lolnon
fd6dc4f9f9 Fixes some functional but kekworthy code in transfer_valve.dm 2015-01-10 09:01:59 +00:00
Sawu
39bcc16206 Experimentor updates 
* Fixes a formatting error in the manual
* Fixed Item layering used by experimentor
* Added "crtical" results for certain R&D items
* Changed the detection for Ian/Runtime
 2015-01-10 16:31:05 +11:00
Cheridan
0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
Sawu
c4bd4bc36b Fixes a mis-spelling 
* Clears all hypocrisy
 2015-01-10 07:24:38 +11:00
Sawu
6b361b077f Experimentor updates 
* Adds "Global" fails that can occur on any EXPERI-MENTOR process.
* Replaces telesci with the Experimental Lab
* Fixes numerous Experimentor bugs (item layers, part exchanger etc)
* Adds an in-game manual to the Experimental lab to teach players to use the machine.
 2015-01-10 07:16:58 +11:00
tkdrg
40e5476a53 Merge pull request #6598 from Incoming5643/InstantSummons 
Magic Mania 1.81: Instant summons!
 2015-01-09 03:29:15 -03:00
Steelpoint
34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
 2015-01-09 11:02:50 +08:00