f2845dbe76
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
aad89409de
Slime update
2014-07-13 17:37:30 +04:00
83ec2c5d80
Readjusted agony of weakbullet.
2014-07-12 12:06:43 -05:00
acb5dfbbe3
Detective Revolver nerf. Uses agony instead of...
...
stun and weaken. Also changed the shotgun's stunshot to be a very powerful agony based shotgun shell. Beanbags are not for combat, stunshots are.
2014-07-12 11:50:16 -05:00
48f02db5a0
Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.
2014-06-29 10:00:35 +09:30
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
6dee9cf65d
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
9f594e4755
Bullets are now properly sharp
2014-06-15 20:28:34 -04:00
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
a528a4db1f
Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.
2014-05-15 14:46:27 +09:30
429684d5ac
Squashed armalis/vox commits and human icon update commits:
...
Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
2014-05-15 14:30:37 +09:30
f2924c9f57
Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons
2014-05-11 13:48:51 +00:00
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
1dc85149ce
Fixes #4716
2014-05-10 00:33:09 +09:30
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
3e7ac27061
Merge pull request #4868 from valzargaming/master
...
Fixes gum.dm firerate
2014-05-02 10:12:15 +01:00
5b289f53c5
Fixes gum.dm firerate
...
Firerate will now properly report to the player what their firemode is set to.
2014-04-30 18:23:42 -05:00
690be8e830
Merge pull request #4863 from mwerezak/shotgun-pump
...
Fixes #4856
2014-05-01 03:13:23 +04:00
f3b0ee8a43
Fixes #4856
...
Shotgun pumping not playing
2014-04-30 10:38:30 -04:00
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
b2d03d67a0
Merge pull request #4819 from Mloc/bs12-itemorgans
...
human: move organ generation into a species proc
2014-04-25 15:33:34 -05:00
28a57a1029
human: move organ generation into a species proc
...
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-04-18 10:44:21 +01:00
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
e7b4161011
Fixed chameleon bullets being able to embed.
2014-04-13 19:21:49 -07:00
496645fc62
Churp
2014-04-11 12:21:28 -05:00
d12f2570cd
Nurp
2014-04-11 12:15:11 -05:00
217c3f78a1
Derp
2014-04-11 12:04:16 -05:00
21cc256945
Hurp
2014-04-11 12:01:33 -05:00
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
c355a30cf6
Removes E-bow Instant Stun. Slight tox buff.
...
The E-bow with the stun is currently the most powerful weapon in the game. Stuns on hit, causes immediate damage, unlimited ammo with recharge, and the stun is not affected by armor. You can viably stunlock someone to death just by occasionally shooting them without running out of ammo. Horrible design and it warrants an immediate removal until I finish my E-bow changes later.
2014-04-10 14:41:37 -05:00
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
e1fef1796e
Merge pull request #4707 from DJSnapshot/tasers
...
replaced electrodes with insta hit taser beams
2014-04-07 02:16:01 -05:00
1a50dddbd4
replaced electrodes with insta hit taser beams.
2014-04-05 17:13:09 -07:00
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
6fa4084d11
Adds 9 new Chameleon items.
...
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.
The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.
These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
2014-03-23 14:08:23 -07:00
c56ec21ee3
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
0ba65efd18
Merge pull request #4477 from Ccomp5950/runtimefixes
...
Runtimefixes
2014-02-25 06:01:59 +04:00
3d88998123
Runtime fix: usr = 0???
...
runtime error: Cannot read 0.item_use_icon
proc name: remove gun icons (/client/proc/remove_gun_icons)
source file: targeting.dm,273
usr: 0
src: Vivalas (/client)
call stack:
Vivalas (/client): remove gun icons()
the taser gun (/obj/item/weapon/gun/energy/taser): dropped(Jonathon Sommer (/mob/living/carbon/human))
Jonathon Sommer (/mob/living/carbon/human): drop r hand(null)
Jonathon Sommer (/mob/living/carbon/human): update canmove()
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): apply effect(5, "weaken", 0)
Jonathon Sommer (/mob/living/carbon/human): apply effects(0, 5, 0, 0, 0, 0, 0, 0, 0)
2014-02-24 01:35:04 -06:00
86c73e242b
Fix for embedding.
2014-02-22 10:16:55 +03:00
d50d49cedb
Bullet inscriptions
...
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names
2014-02-09 22:52:27 +13:00
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08:00
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
2d25c94900
Sniper Rifle Zoom proc documentation comments.
2014-01-22 23:46:05 -06:00
b260d511fb
Gun fixes.
...
You die, you are zoomed out
You have welding equipment on, you can't zoom in.
2014-01-22 23:40:32 -06:00
fbcf162416
Sniper Rifle fix.
...
You have no HUD when zoomed. None, I'm unable to move every HUD element while zoomed in so you lose it. Consider it part of your concentration while zoomed in.
If you move while zoomed in you automatically zoom out, you lose concentration.
If the rifle isn't in your active hand you can't zoom in.
2014-01-22 22:40:21 -06:00
90ce5b2b69
SPACE2TAB modules/projectiles/guns/energy/special.dm
...
No changes other then space2tab is done in this commit.
2014-01-15 23:42:55 -06:00
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
3f3ae1fad6
Rocket launchers shouldn't probably fit on belt
2013-12-28 16:25:49 +04:00
mwerezak