cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-08 07:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,179 Commits 72 Branches 14 Tags
94de5c997e3f8155b981be4ac6b5e19bf59ebd80
Commit Graph

671 Commits

Author SHA1 Message Date
Menshin ca9f31a0e3 * Unified the firing proc for energy and ballistics mech guns 
* Fixes incendiaries bullets runtiming on qdel
 2015-03-17 23:58:03 +01:00
Jordie0608 f0731d01e2 changelog compiled 2015-03-17 20:03:31 +11:00
Jordie fb6aa85094 Merge pull request #8274 from Thunder12345/techshellening 
Shotgun party, new shells, an improvement and a fix
 2015-03-16 18:30:14 +11:00
Cheridan 3bc34e5383 Merge pull request #8310 from phil235/RussianRevolverFix 
Fixes russian revolver's special mechanism message
 2015-03-15 01:57:46 -05:00
Cheridan 24b2d03e0f Merge pull request #8283 from Miauw62/taserdelayymao 
Reduces the taser firing delay.
 2015-03-13 12:58:24 -05:00
phil235 921ed1330e Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory. 
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
 2015-03-12 14:34:23 +01:00
Thunder12345 8a780e89bf Overloading improvised shells 
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
 2015-03-11 11:41:26 +00:00
phil235 cb96e65f1b Merge pull request #8254 from Steelpoint/HoSGunSpelling 
[BALANCE]Buffs the Head of Security's Firearm.
 2015-03-10 22:09:46 +01:00
Miauw 09cf2e474f Reduces the taser firing delay. 2015-03-10 19:36:05 +01:00
Thunder12345 9723f6d092 Laser slugs + improvised shell fix 
Adds laser slugs, fixes improvised slug recipe
 2015-03-10 15:55:29 +00:00
Thunder12345 56ab83d4e7 Ion shell updates 
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
 2015-03-10 14:42:08 +00:00
Thunder12345 a1a5edd314 FRAG-12, ion, improvised shotgun shells 
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
 2015-03-10 13:57:54 +00:00
Steelpoint a5ba5972b4 AdditionalSpelling 2015-03-10 17:26:05 +08:00
Steelpoint 79857b0eac InitalCommit 2015-03-09 17:02:34 +08:00
Cheridan 7ec6ad84cd Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning 
Conflicts:
	icons/mob/back.dmi
 2015-03-08 23:15:22 -05:00
Cheridan e2554c55e6 Merge pull request #8147 from Cheridan/master 
Manual Merge of #7607
 2015-03-04 00:39:34 -06:00
Cheridan 56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll 
Conflicts:
	code/game/gamemodes/blob/overmind.dm
 2015-03-04 00:33:44 -06:00
Cheridan 3fd821bdd7 Merge pull request #7986 from phil235/TaserJitterFix 
Fixes taser stun duration
 2015-03-04 00:01:49 -06:00
Remie Richards 736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll 
Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm
 2015-03-01 00:18:19 +00:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
phil235 d4711bbc72 Fixes taser stun duration to be back to normal, also jitter animation now only starts after the mob falls to the ground. 2015-02-25 15:24:06 +01:00
paprka 9e450b30df further improvements and changelog 2015-02-25 00:25:27 -08:00
paprka 7a8e78a4c3 this kills the object verbs 2015-02-25 00:19:53 -08:00
Steelpoint 9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-25 14:10:54 +08:00
paprka 1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka 7fad8a3bab nerfs energy bolts more 2015-02-24 20:04:48 -08:00
paprka 393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
 2015-02-24 20:03:33 -08:00
Steelpoint da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-25 11:44:27 +08:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
phil235 4df2a92f88 Merge pull request #7824 from Delimusca/zipzaps 
replaces broken turret gun
 2015-02-23 23:38:10 +01:00
Delimusca b30aaf3b47 fixed turret slotflag, inheritance vars 2015-02-23 14:55:26 -07:00
Delimusca 941e4ba907 increased heavy recoil, reduced drop chance 2015-02-22 18:52:53 -07:00
phil235 3e100729bc Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you. 2015-02-22 23:02:07 +01:00
Delimusca f608bf2a31 improves heavy weapons 2015-02-21 19:00:31 -07:00
paprka 55dcc82f45 fixes leftover delay line 2015-02-20 01:58:32 -08:00
Steelpoint 1221f012c6 Breach to Disable 2015-02-20 11:41:56 +08:00
hornygranny ea12d68e60 Merge pull request #7817 from paprka/whatthefucktg 
Syndicate shotguns spawn with buckshot by default
 2015-02-19 13:07:08 -08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
Delimusca dbc6b91921 Merge branch 'updaterclean' into zipzaps 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-18 22:03:03 -07:00
Delimusca 4f6c74d291 replaces turret egun with ecannon 2015-02-18 21:24:07 -07:00
paprka efbb4f5116 makes syndicate shotguns spawn with buckshot by default 2015-02-18 14:10:46 -08:00
paprka 388e0a330e fixes firing delay 2015-02-18 02:55:28 -08:00
paprka 074a139576 Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-18 02:29:07 -08:00
Steelpoint 8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-18 12:50:05 +08:00
paprka 15e2b88a0f removes bloat from magazines icons 2015-02-17 19:43:20 -08:00
phil235 dcf99380b6 Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos 
Introducing the Ion Carbine!
 2015-02-18 00:16:33 +01:00
GunHog 9d7b7a34ae Fixes my merge error. 2015-02-17 14:47:26 -06:00
paprka 71758715fa some typo fixes 2015-02-15 13:33:15 -08:00
paprka 8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
 2015-02-15 10:27:50 -06:00