cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,355 Commits 61 Branches 14 Tags
60fc73d018ffcafdaf805b2e047d6cd328522bfc
Commit Graph

475 Commits

Author SHA1 Message Date
Swag McYolosteinen
7ee2317ec3 Merge pull request #6207 from phil235/RecursiveHearVisibleMessage 
Mob inside something can now see visible_message()'s
 2014-12-27 13:20:50 +01:00
paprka
109be766d6 fixes a few bugs 2014-12-26 19:23:22 -08:00
paprka
615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd 
Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm
 2014-12-26 16:14:19 -08:00
paprka
21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi
 2014-12-25 13:51:43 -08:00
paprka
595ad8df58 fixed compile errors 2014-12-24 21:03:22 -08:00
paprka
7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
paprka
1d1baa96bc Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-24 18:56:26 -08:00
phil235
8707e37845 Fixes russian revolver being abusabled. You can no longer use it on someone other than yourself. Aiming somewhere other than head/eyes/mouth doesn't instakill but still deals damage. You need to spin the chamber after each shooting attempt. Only humans can use the gun. 
Making a can_trigger_gun() proc that tests if the mob can trigger the gun.
 2014-12-23 21:08:00 +01:00
paprka
47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-21 20:32:34 -08:00
Menshin
20c640ae38 Added some defines for better clarity 2014-12-21 02:10:01 +01:00
Menshin
05378c014d * fixes #3765 (shotguns sawing off) 
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
 2014-12-21 01:35:49 +01:00
phil235
2481bef95f Changed the visible_message procs and audible_message procs, they now use the new get_player_mob_hearers_in_view() proc instead of a recursive proc. 
I removed some duplicated code from tools/tools.dm

Fixed two typos with span class.
 2014-12-20 17:29:23 +01:00
Cuboos
0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 
Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt
 2014-12-15 18:12:14 -08:00
paprka
10695c16b0 fixes everything, updates jitter amount 2014-12-15 01:00:53 -08:00
paprka
1fd9e6bfda Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/obj/gun.dmi
 2014-12-14 21:55:28 -08:00
paprka
ddfac78cf2 initial commit for adding jitteriness for electrodes 2014-12-14 21:47:29 -08:00
Cheridan
753202d008 Merge pull request #6341 from paprka/gunspritefix 
Fixes a few bugs with gun and ammo icons
 2014-12-14 23:26:36 -06:00
paprka
e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
paprka
0c2ed6ab8f Fixes a couple missing var settings 2014-12-14 05:15:13 -08:00
paprka
dddacbc245 Burst fire for automatic weapons 2014-12-14 05:06:19 -08:00
paprka
ea69908122 Buff mech smg bullets a little, added changelog 2014-12-13 23:31:46 -08:00
paprka
30cbff2802 fixes a few bugs with gun and ammo icons/obj/gun.dmi 2014-12-13 17:13:25 -08:00
Thunder12345
3bc8b4f777 Description update 
Changed the description of the FRAG-12.
 2014-12-11 21:23:16 +00:00
Thunder12345
a0476d975e Movin' house 
Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
 2014-12-11 21:23:15 +00:00
Thunder12345
8e2dc381ed FRAG-12 + admins.txt 
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
 2014-12-11 21:16:45 +00:00
paprka
2315660b9f added range to the 40mm grenade 2014-12-10 23:57:12 -08:00
paprka
dc01a092af Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi
 2014-12-10 23:55:51 -08:00
paprka
b65df8425f trims some unnecessary code 2014-12-10 22:56:52 -08:00
paprka
6b474784e5 Reverts ebow stun nerf, buffs the range 2014-12-10 01:49:46 -08:00
paprka
6e2fc37ccd adds advanced taser 2014-12-10 01:07:33 -08:00
paprka
e53f8294d7 initial commit for nerfing ranged stuns 2014-12-10 00:16:53 -08:00
paprka
f917bd2906 fixed some double periods 2014-12-08 19:13:44 -08:00
paprka
b01e6ba882 Generic names and buffs 2014-12-08 16:49:48 -08:00
paprka
bcf6fe2a69 adds c90 and bulldog to summon guns, fixes 40mm flames 2014-12-08 02:04:32 -08:00
paprka
94c5ea931d functional grenade launcher shooting 2014-12-08 01:22:27 -08:00
paprka
d082cdd383 commit for grenade launcher moving 2014-12-08 00:30:10 -08:00
paprka
5b6039a521 changes to the uplink and further c90 updates 2014-12-07 19:39:24 -08:00
Cuboos
fb6e756502 Defib sounds plus Code 
Defibt sounds added plus code edits to accept new defib sounds and new weapon sounds

Defib previews
https://dl.dropboxusercontent.com/u/9654207/def_saftyOff.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_charge.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_failed.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_ready.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_SaftyOn.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_success.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_zap.ogg
 2014-12-05 22:18:34 -08:00
paprka
1a591f06e7 c90gl improvements for code, added grenade launcher as a stand-in for now 2014-12-05 20:20:45 -08:00
paprka
481fffcb08 second commit for c90gls 2014-12-05 18:13:04 -08:00
paprka
2425903320 intial commit, renames stechkin 2014-12-04 18:13:50 -08:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-11-29 09:37:40 +02:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump 
Projectiles bump fix, spawn() removal
 2014-11-27 03:38:05 +03:00
Aranclanos
fc1766e7c0 Readds the emitter pooling, reverting my previous commit. 2014-11-23 21:40:51 -03:00
Remie Richards
eead810fcc Merge pull request #5875 from phil235/RevolverMalfFix 
Fixes the modified detective revolver blowing up with empty chamber
 2014-11-23 15:11:28 +00:00
Incoming
4a4b39b57f fixes the spider pathing 2014-11-15 14:55:48 -05:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen 
Adds bee swarms and butterflies and diseases to create them
 2014-11-13 17:04:29 -06:00
phil235
bcd6658575 Fixes the detetive revolver so when modified it can't blow up when shooting with an empty chamber. Adding a firing sound when the malfunction happens. 2014-11-13 14:48:30 +01:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen 
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
 2014-11-09 00:15:12 +11:00