Commit Graph

606 Commits

Author SHA1 Message Date
paprka
30cbff2802 fixes a few bugs with gun and ammo icons/obj/gun.dmi 2014-12-13 17:13:25 -08:00
Razharas
11f6c7c401 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-12 04:51:16 +03:00
Razharas
0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03: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
Aranclanos
e6fd279486 Removes the spawn() in the Bump() proc of projectiles.
Fixes issue #1291
Cleaned up some files of projectiles/firing.dm
Instead of calling process(), when firing a projectile it will use fire()
Projectiles will now use qdel(), due to this, the emitters beams won't be in the object pool.
2014-11-04 15:21:48 -03:00
paprka
827dcac56a last minute changes to gun for massive realism 2014-11-03 23:47:20 -08:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
Incoming
dd3b61d880 removes an apparently unsafe but otherwise asymptomatic qdel 2014-10-30 17:16:00 -04:00
Incoming
d2982a4b8e Adds drones, blobbernauts, magicarp, and chaos magicarp to the staff/wand of change
Makes it so player controlled mobs with a ranged attack can actually use said ranged attack
Fixes #5551 because it's vaguely magic related anyways
2014-10-30 14:29:06 -04:00
paprka
1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
Hornygranny
cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Hornygranny
68ca3ad091 projectiles no longer anchored, spawns off throw 2014-10-27 18:00:35 -07:00
Hornygranny
264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
Perakp
0761d42d65 Bluespace wormhole projector
- emits quantum-coupled bluespace beams
- high research requirements: combat 6, materials 6, bluespace 4
- sprites by Nienhaus. Big thanks!
- electrodes now colored with the color var
2014-10-26 15:06:30 +02:00
MrPerson
2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam
Conflicts:
	code/modules/mob/living/living.dm
2014-10-25 23:25:27 -07:00
MrPerson
ef6204656f Space movement rewrite to allow everything to drift
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
2014-10-25 23:19:46 -07:00
hornygranny
79c61500f1 Merge pull request #5399 from phil235/LaserGunFix
Fixes the lasergun icon never being empty.
2014-10-22 10:53:49 -07:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
phil235
ebabe9af3a Fixes the lasergun icon never being empty. 2014-10-21 15:36:18 +02:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
2014-10-20 20:18:06 -07:00
paprka
42e871a6ed added sawing off to all weapons 2014-10-19 17:49:05 -07:00