cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,552 Commits 8 Branches 0 Tags
68dc63e005f801bf5a2cb10b8c89ddcd1323d219
Commit Graph

202 Commits

Author SHA1 Message Date
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
mwerezak
bd397ff844 Adjusts laser cannon damage 
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
 2014-08-16 22:34:23 -04:00
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
a6c31bc5e8 Fixes xbow tension not being rest when fired 2014-08-07 17:06:01 -04:00
Zuhayr
f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
DJSnapshot
bb336b7691 temporary fix for #4907 2014-07-23 21:48:32 -07:00
Zuhayr
d02e370830 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 2014-07-21 19:02:38 +09:30
mwerezak
f2845dbe76 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.
 2014-07-15 01:14:04 -04:00
Zuhayr
48f02db5a0 Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon. 2014-06-29 10:00:35 +09:30
Chinsky
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
mwerezak
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
Zuhayr
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
Zuhayr
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
Zuhayr
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
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Mloc-Argent
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
Chinsky
690be8e830 Merge pull request #4863 from mwerezak/shotgun-pump 
Fixes #4856
 2014-05-01 03:13:23 +04:00
Mike
f3b0ee8a43 Fixes #4856 
Shotgun pumping not playing
 2014-04-30 10:38:30 -04:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
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
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
Chinsky
09efeaea5c Fixed detective semiauto turning wrong caliber when screwdrived. 2013-12-17 22:32:23 +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
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Chinsky
a7be4d9353 Fixes #3781 
Magical thingies now go zzap instead of click click when empty.
 2013-10-16 11:06:43 +04:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03: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
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Segrain
292b04399c Doublesuperheating fix. 2013-08-08 02:43:23 +03:00
comma
bdaeb2c6fb Adds fire delay to all weapons (except automatics). 
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
 2013-07-10 21:19:21 +04:00
Zuhayr
b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00
Zuhayr
94c3c7ef49 Armalis additions, tweaks. 2013-06-16 13:17:20 -07:00
Zuhayr
23299809f6 Armalis sprites, simple animal/mob yank-out verb and embedding. 2013-06-16 00:38:40 -07:00