cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,143 Commits 61 Branches 14 Tags
c08e4e43322089ffcbfccbe622b0b2c44d1478ef
Commit Graph

7500 Commits

Author SHA1 Message Date
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
tkdrg
e0df8b1a00 Merge pull request #7048 from phil235/FeedMessageFix 
Fixes feeding messages that was showing the attacker's message to the victim.
 2015-01-16 15:10:39 -03:00
Swag McYolosteinen
0ebd227f71 Merge pull request #7034 from paprka/nosenseofrightandwrongiguess 
Crossbow, speargun, and grenade updates
 2015-01-16 16:43:50 +01:00
phil235
f5ab9bad47 Merge pull request #7051 from Menshin/dead_ahunter_leaping_fix 
Made non-leaping thrown aliens impact like normal mobs
 2015-01-16 16:32:47 +01:00
phil235
c543fdf100 Merge pull request #7063 from Iamgoofball/goonchem_map 
Fixes #7059
 2015-01-16 16:26:57 +01:00
phil235
102c240039 Merge pull request #7066 from Firecage/hydro_tray_wrenching_time 
Adds a delay to anchoring/unanchoring a hydroponics tray. Fixes #6466
 2015-01-16 14:18:26 +01:00
phil235
c15c008524 Merge pull request #7089 from Firecage/space_clown_b_gone 
Stops clown shoes from squeaking in zero grav, and thus space. Fixes #6568
 2015-01-16 13:39:42 +01:00
Firecage
204fdb8b2f Update to biogenerator stuff PR 2015-01-16 09:24:39 +02:00
paprka
4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
 2015-01-15 22:16:11 -08:00
tkdrg
6bfebf2e48 Adds bolt-action rifle 
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151

These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.

The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
 2015-01-16 03:03:34 -03: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
tkdrg
b721fd72de Merge pull request #5902 from Razharas/NewShit 
Turbine fixing general
 2015-01-15 22:43:28 -03:00
Razharas
d30872024c And other readibility improvement 2015-01-16 04:31:02 +03:00
Razharas
f393be45b6 Tiny readibility improvement 2015-01-16 04:08:07 +03:00
Cheridan
ea4b5b2872 Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned 2015-01-15 16:17:51 -06:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
Razharas
5176efb88b Merge branch 'master' of https://github.com/tgstation/-tg-station into NewShit 
Conflicts:
	code/game/machinery/Freezer.dm

Fixing conflicts
 2015-01-16 00:24:53 +03: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
Swag McYolosteinen
2082baa64b Merge pull request #7042 from phil235/AudibleMessageRuntimeFix 
Fixes some runtimes from audible_message proc.
 2015-01-15 19:14:31 +01:00
Firecage
baac32890b Stops clown shoes from squeeking in space and zero grav. 2015-01-15 13:18:01 +02: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
Firecage
2aa837f8f4 Wrench/unwrench messages only one for hydro trays 2015-01-15 09:27:03 +02:00
JJRcop
4c8f890f88 Adds Timeline Eradication Device 2015-01-15 02:18:04 -05:00
tkdrg
d3975845b9 Merge pull request #6688 from phil235/LibraryComputer 
Library console are now real buildable computers
 2015-01-15 00:46:24 -03:00
Firecage
e4e5c1ae62 This adds a delay to anchoring and unanchoring a hydroponics tray. 2015-01-15 02:45:51 +02:00
Iamgoofball
fe73421b25 Fixes #7059 2015-01-14 15:52:53 -08:00
Menshin
416c71b99e * Non-leaping thrown aliens are now behaving like other mobs 
* Removed a useless check
 2015-01-14 20:32:51 +01:00
phil235
778a10688d Fixes feeding messages that was showing the attacker's message to the victim. 2015-01-14 19:57:39 +01:00
tkdrg
674b3b65c0 Merge pull request #6968 from phil235/LockdownMalfFix 
Fixes malf AI lockdown affecting doors on away missions
 2015-01-14 14:58:10 -03: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
phil235
bd189431d0 Merge pull request #7002 from Menshin/gunlights_runtimes_fix 
Fixes "Toggle Gunlight" verb runtimes
 2015-01-14 17:29:15 +01:00
phil235
f93ee8b99b Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path. 2015-01-14 14:04:21 +01:00
MrPerson
85b277c404 Merge pull request #7011 from Firecage/Blubbery_be_gone 
This fixes that "You suddenly feel blubbery" message spam.
 2015-01-14 02:12:28 -08: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
Iamgoofball
fecaa06cff removes getTotalLoss() for REAL THIS TIME 2015-01-13 21:02:37 -08:00
Iamgoofball
57ad61f75f removes scrollbar from chemdispenser nanoui menu due to new chems 2015-01-13 20:56:39 -08:00
Iamgoofball
a70cfc4c86 fixes medipens even more 2015-01-13 20:49:54 -08:00
Iamgoofball
e8217f7eae fixes medipens more 2015-01-13 20:46:38 -08:00
Iamgoofball
b80723265d Adds an extra chemical, tweaks, fixes, changes to be more accurate to Goonchem. 2015-01-13 20:24:11 -08:00
paprka
2fd8b3e749 nerfed saber slightly 2015-01-13 20:05:37 -08: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
Iamgoofball
8e9c008030 forgot to end a span class 2015-01-13 19:08:07 -08:00
Iamgoofball
8b39dec424 span classes 2015-01-13 19:06:41 -08:00
tkdrg
d10364797a Merge pull request #6981 from dannno/bandanno's 
Bandanas/More jumpsuits in mixed fixed
 2015-01-13 21:49:47 -03:00