cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-17 04:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,764 Commits 75 Branches 14 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

654 Commits

Author SHA1 Message Date
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
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
Cheridan 6de520bbb2 Merge pull request #7710 from phil235/JitterFix 
Add a do_jitter_animation proc
 2015-02-14 16:23:18 -06:00
Cheridan 47a631b1c7 Merge pull request #7713 from paprka/wotdefuk 
fixes improvised shotgun back slot invisible shit
 2015-02-14 16:01:39 -06:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. 
Fixes Alien embryo processing that was processed twice.
 2015-02-14 14:18:49 +01:00
Swag McYolosteinen 1aa7f423e9 Merge pull request #7720 from Iamgoofball/patch-32 
fixes #7719
 2015-02-14 12:14:17 +01:00
Swag McYolosteinen b2d6ce5481 Merge pull request #7668 from dannno/suicidefix 
Fixes #7647
 2015-02-14 12:12:38 +01:00
Steelpoint a9c9f7c2cb BalanceChange-5stun10laser 2015-02-14 17:56:35 +08:00
Iamgoofball a51ffe8cd4 fixes #7719 
welp
 2015-02-13 20:08:01 -08:00
Cheridan 14c9abaaee Merge pull request #7539 from Iamgoofball/kinetic 
Ports the kinetic accelerator changes from NT
 2015-02-13 17:56:03 -06:00
paprka cff73d83c6 fixes improvised shotgun back slot invisible shit 2015-02-13 14:04:23 -08:00
phil235 5b7a0b0358 Fixed the jitter effect of the taser (it was broken). Hulks now don't jitter when stunned but scream. Humans and monkeys jitter immediately after getting tazed and only fall after 2 seconds. 2015-02-13 22:53:47 +01:00
paprka 354ce2a458 removes shot delay on stun revolver 2015-02-13 09:35:30 -08:00
paprka 54040d9867 stun changes and stun revolver 2015-02-13 09:26:31 -08:00
dannno db0fd07f0f fixes blowing your brains out without a gun 2015-02-12 15:05:45 -05:00
Steelpoint 940601bcfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-13 01:14:52 +08:00
GunHog 0b0737b292 Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos 
Conflicts:
	icons/mob/belt.dmi
	icons/obj/guns/energy.dmi
 2015-02-12 09:08:31 -06:00
Cheridan 566fd07593 Merge pull request #7651 from paprka/tacticalfleshlight 
makes flashlight attaching more modular
 2015-02-12 07:55:26 -06:00
Remie Richards 6613851028 Merge pull request #7593 from Cheridan/pin_fix 
Pin fixes, additions
 2015-02-12 06:43:11 +00:00