Ccomp5950
e1fef1796e
Merge pull request #4707 from DJSnapshot/tasers
...
replaced electrodes with insta hit taser beams
2014-04-07 02:16:01 -05:00
DJSnapshot
1a50dddbd4
replaced electrodes with insta hit taser beams.
2014-04-05 17:13:09 -07:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
iamgoofball
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
Ccomp5950
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
Chinsky
0ba65efd18
Merge pull request #4477 from Ccomp5950/runtimefixes
...
Runtimefixes
2014-02-25 06:01:59 +04:00
Ccomp5950
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
Segrain
86c73e242b
Fix for embedding.
2014-02-22 10:16:55 +03:00
Loganbacca
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
Ccomp5950
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08:00
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Ccomp5950
2d25c94900
Sniper Rifle Zoom proc documentation comments.
2014-01-22 23:46:05 -06:00
Ccomp5950
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
Ccomp5950
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
Ccomp5950
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
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Chinsky
3f3ae1fad6
Rocket launchers shouldn't probably fit on belt
2013-12-28 16:25:49 +04:00
DJSnapshot
eeeae3d285
fixes because Sue is silly.
2013-12-27 20:23:44 -08:00
DJSnapshot
1f5e278aa6
Added Sue's new weapon code and sprites.
2013-12-27 16:44:44 -08:00
Chinsky
6630a046c9
Merge pull request #4095 from DJSnapshot/dev-freeze
...
Misc Fixes to guns
2013-12-23 04:38:44 -08:00
Zuhayr
d783fd5043
Manual binary merge of head icons.
2013-12-22 23:23:25 +10:30
DJSnapshot
1324be7189
Fix for guns eating empty magazines.
2013-12-21 23:15:36 -08:00
DJSnapshot
2f0b5e31f4
Fix so magazines read correctly on the Colt M1911.
...
Also notice for when the clip falls out.
2013-12-21 22:58:24 -08:00
Zuhayr
9fe07feb95
Prevented staff of change from working on infested mobs.
2013-12-18 13:49:35 +10:30
Chinsky
09efeaea5c
Fixed detective semiauto turning wrong caliber when screwdrived.
2013-12-17 22:32:23 +04:00
Mloc-Argent
b175c6906b
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2013-12-13 19:13:43 +00:00
DJSnapshot
a8eebd17d0
Grammar fix and fix to c45 being declared twice in boxes.dm
2013-12-08 12:25:00 -08:00
Ccomp5950
570c98f0e2
Runtime fix: N00k agents on spawn were causing a runtime here.
2013-12-07 05:18:27 -06:00
Chinsky
027b0d8ec6
Merge branch 'master' into dev-freeze
...
Conflicts:
html/changelog.html
2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b
Merge branch 'dev-freeze' into dev
...
Conflicts:
icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Chinsky
5d3e712d64
Merge branch 'master' into dev-freeze
...
Conflicts:
html/changelog.html
2013-11-30 05:11:36 +04:00
Chinsky
83d1924b83
Commiting SueTheCake's detective things.
...
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
2013-11-27 04:10:06 +04:00
Ccomp5950
72b762db53
Can no longer commit suicide with a lasertag gun.
...
And you will feel silly for even making the attempt.
2013-11-23 21:51:15 -06:00
Higgin
d72d845cba
Fix to fix a fix that needs fixing.
2013-11-20 16:00:07 -08:00
Higgin
f42ac118aa
Fix because I'm dumb.
2013-11-16 21:21:40 -08:00
Higgin
057eaba09e
Changes to how projectiles work: take two!
...
-Embedding is now a function of armor and projectile base damage.
-Chances to hit varied body parts are modified via miss_modifier. Less likely to hit head, extremities, etc. Distance is more of a factor.
2013-11-16 17:45:38 -08:00
Kilakk
9b540474f3
Changed the embed check to use its own var instead of checking damagetype
...
* var/embed = 0
* The bullets the detective's revoler uses (weakbullet) will no longer embed into anything.
2013-10-31 22:05:58 -04:00
Nanai
81632df611
Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim.
2013-10-30 17:12:42 -04:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Mloc
90378111e1
Fixes #3777
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-16 11:21:51 +01:00
Chinsky
a7be4d9353
Fixes #3781
...
Magical thingies now go zzap instead of click click when empty.
2013-10-16 11:06:43 +04:00
Chinsky
7c681b2bd8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/new_player/new_player.dm
2013-10-15 10:56:50 +04:00
Aranclanos
9af5c85c58
Duplicates the speed of the gameticker!
...
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.
This will add lag due to everything being faster.
2013-10-13 17:11:39 -03:00
Mloc-Argent
8b2c3fc153
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:24:21 +01:00
Segrain
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +03:00
jack-fractal
474f44645d
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-09-12 00:10:12 -04:00
jack-fractal
e73c06e51c
Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging.
2013-09-11 23:33:23 -04:00
Zuhayr
7ab7a61812
Merge resolution, using dev-freeze map.
2013-09-09 21:59:47 -07:00
Chinsky
cafa176548
Merge pull request #3647 from SkyMarshal/patch-2
...
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
2013-09-04 07:20:15 -07:00
SkyMarshal
99bf9db04c
Fixes lastertag guns killing you if you stick it in your mouth.
2013-09-03 22:51:37 -07:00
