cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 15:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,187 Commits 61 Branches 14 Tags
1647bbd6039684ccf3d8dfffb774de92df32e1df
Commit Graph

13824 Commits

Author SHA1 Message Date
hornygranny
1647bbd603 Merge pull request #7139 from Menshin/clientless_vision_runtime_fix 
Fixes runtime related to handle_vision for clientless mobs
 2015-01-19 09:01:10 -08:00
tkdrg
98ecd7ffdc Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup 
Goon Chemistry: Addiction and Overdosing
 2015-01-19 03:32:57 -03:00
Iamgoofball
80b5dce212 whoops 2015-01-18 22:19:21 -08:00
Iamgoofball
b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Cheridan
c226a7aa2e Merge pull request #7053 from Chocobro/interceptreportimprovement 
updates intercept report w/ formatting, spellcheck
 2015-01-18 22:14:26 -06:00
Cheridan
cc0a9a674e Merge pull request #7147 from paprka/clothescleanup 
Removes a ton of bloat from several clothing files and inhands
 2015-01-18 20:26:36 -06:00
Orange Borg
893c876261 Add the message argument to can_speak 
It is needed for *raisans*
 2015-01-19 10:25:51 +13:00
Swag McYolosteinen
6798919be6 Merge pull request #7137 from tkdrg/heatertweak 
Fixes heaters breaking chem dispenser research
 2015-01-18 11:23:07 +01:00
Cheridan
2f66068231 Merge pull request #7101 from Carn/timsort_fix 
Fixes timSort
 2015-01-17 23:19:19 -06:00
paprka
a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
Cheridan
bd8594dd20 Merge pull request #7116 from bear1ake/protolathe-fix 
Adds "Firing pins" category to protolathe
 2015-01-17 15:59:28 -06:00
tkdrg
059d8cf650 Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention 
Some disposals cleaning/stacking fix
 2015-01-17 17:16:52 -03:00
Menshin
07d38a6515 Fixes runtime related to handle_vision for clientless mobs 2015-01-17 21:02:29 +01:00
tkdrg
3c2f10e401 Fixes heaters breaking chem dispenser research 2015-01-17 16:34:00 -03:00
phil235
8a61d11e2e Merge pull request #7069 from Firecage/table_deconstruction_fix 
Fixes amount of materials gotten from deconstructing tables
 2015-01-17 19:57:49 +01:00
Iamgoofball
b031c23a9e woop woop warning fix woop woop 2015-01-16 21:09:07 -08:00
tkdrg
3a397a9472 Merge pull request #7124 from Iamgoofball/goonchem_shoehorn_backup 
Removes Star Trek chemicals, replaces them with Goon Chemistry
 2015-01-17 01:32:38 -03:00
Iamgoofball
a93ffe46a6 changes and tweaks 2015-01-16 20:18:56 -08:00
Iamgoofball
80a3e119f4 removes incorrect sound effects 2015-01-16 19:32:34 -08:00
Iamgoofball
8b3cff9281 Forgot a ephedrine -> epinephrine 2015-01-16 19:29:25 -08:00
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
fec3b3e9dd Changes, adjustments, NEW CHEMICAL: Epinephrine 2015-01-16 17:56:55 -08:00
Remie Richards
3867079e51 Merge pull request #7068 from tkdrg/toast 
Adds chemical heater nanoUI & construction/upgrade
 2015-01-17 01:29:13 +00: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
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
bear1ake
22c1889725 Adds "Firing pins" category to protolathe 2015-01-17 01:23:04 +09:00
Swag McYolosteinen
2ed26720d4 Merge pull request #7082 from paprka/varincrease 
Further adjusts dirt on tiles
 2015-01-16 17:00:55 +01: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
Firecage
dc602f9d57 Indentation fix. How did that single space instead of the tab worl anyway... 2015-01-16 15:38:31 +02:00
phil235
3594c96aca Merge pull request #7090 from Firecage/HONKER_mousetrap_mortor 
Fixes the issue of mousetrap mortars firing unarmed mousetraps.
 2015-01-16 14:22:30 +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
018b7379b4 Merge pull request #7088 from Firecage/tele_window_knocking_delay 
Simply adds a delay to knocking in windows with TK.
 2015-01-16 13:59:39 +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
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
51a42968f0 Merge pull request #6886 from hornygranny/soulshardboogaloo 
only wizards and cultists can use soul shards
 2015-01-15 23:11:11 -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