cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,445 Commits 10 Branches 0 Tags
45ccdff1ac2e2a7bc1fe67e9c5fcdaf4bd1b9292
Commit Graph

934 Commits

Author SHA1 Message Date
Yoshax
45ccdff1ac Improves the silenced pistol by lowering the fire delay and removing the recoil 2016-07-25 15:58:07 +01:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/clothing.dm
 2016-07-19 17:37:14 -04:00
Neerti
728cd2bdd3 Adds accuracy penalties for certain detrimental states. 
Being blind gives an additional 75% chance to miss.
Having blurry eyes gives an additional 15% chance to miss.
Being confused gives an additional 30% chance to miss.

This was done so that if the PR for flashes to apply these effects instead of a stun are merged, they would hopefully still be useful if someone is trying to robust you.  Melee and ranged penalties should be equivalent, despite different numbers due to how the different code works.
 2016-07-14 06:19:49 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Daranz
c0bfd668bb Rename '12mm' to '10mm' in sprites 
Round is already referred to as '10mm' everywhere else.
 2016-07-11 05:22:23 +01:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
Neerti
6c071290c8 Merge pull request #1983 from Anewbe/ninja_cloak+dart 
Fixes some Ninja stuff
 2016-06-27 01:25:47 -04:00
Datraen
c391a58ab2 Merge pull request #1909 from Yoshax/heavyguns 
Heavy weapons changes
 2016-06-27 00:09:18 -04:00
Neerti
20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
Anewbe
17e211e200 Fixes some Ninja stuff 2016-06-26 18:20:35 -05:00
Richard D'angelo
7ab5220f64 510 Improved Overlays 
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
 2016-06-18 15:50:10 -03:00
Yoshax
6db7f306c0 Removes self-recharge 2016-06-17 21:53:26 +01:00
Spades
e650531dba Desert Eagle empty icons added. 2016-06-14 16:17:25 -04:00
Yoshax
1856897894 Heavy weapons changes 2016-06-10 18:34:58 +01:00
HarpyEagle
4cf0d2bad1 Fixes many dense objects from stopping penetrating bullets 2016-06-07 19:30:21 +01:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request. 
It's just a 10 round 762 magazine. It's compatible with the STS.
 2016-06-06 22:03:03 -04:00
Spades
3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Datraen
a5c615cbd1 Merge pull request #1872 from Anewbe/energy_burst_change 
Tweaks FM-2t to possibly be usable
 2016-06-05 13:58:32 -04:00
Spades
f6497ee60d Changelog says I changed this but I didn't. 2016-06-05 13:40:37 -04:00
Spades
9da3e9bac7 Comment corrections to clear confusion. 2016-06-05 13:18:07 -04:00
Spades
037271504e No five-round burst! I thought I removed these! 2016-06-04 01:36:56 -04:00
Anewbe
cdb5966576 Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too 2016-06-03 23:58:00 -05:00
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -04:00
Spades
23e609ccb3 Fuckit. Silenced sound can go. It's unrealistic anyway. 
I could have fixed it but meh.
Also map cleanup.
 2016-06-03 20:37:05 -04:00
Spades
700b8b5934 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-03 20:29:19 -04:00
Spades
a063c8915e Feedback based on meeting. 
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
 2016-06-03 20:21:12 -04:00
Spades
09788190c2 Reverted autolathe changes. 
Need to fix this exploit some other way, some other day.

Also fixed some oversights.
 2016-06-03 18:22:19 -04:00
Datraen
245b353375 Merge pull request #1726 from Yoshax/dnalockframework 
Adds a framework to allow guns to be locked to dna
 2016-06-03 17:25:17 -04:00
Spades
dd0c3935e7 Gun lore updates. 
Also changed the path of the bullpup rifle.
 2016-06-03 10:33:04 -04:00
Spades
e0748c8261 Response to feedback. 
Tried to make descriptions better.
SAW magazine no longer fits in pockets.
 2016-06-03 01:57:13 -04:00
Spades
0d5b943db7 Github client being stupid. Changed these names too. 2016-06-02 17:19:57 -04:00
Spades
c6b650afa5 Changed some new gun names based on feedback. 
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
 2016-06-02 17:16:21 -04:00
Spades
093ab24339 Few quick fixes 
- Fixes shotgun magazine icon.
- SAW uses correct sound.
- Shotgun revolver uses correct sound.
- Mosin has a back sprite now. Placeholder.
 2016-06-02 14:32:37 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Yoshax
efe66153ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dnalockframework 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-01 00:47:52 +01:00
Datraen
ae3157d5c3 Merge pull request #1787 from EmperorJon/28_May_Port_setup_changes 
Manual port of BS12 setup changes
 2016-05-28 22:59:56 -04:00
Jon
21f898e047 First commit of manual port of BS12 
#13042
and
#13086
 2016-05-29 00:56:11 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes 
Various Borg Changes
 2016-05-28 12:44:27 -04:00
Yoshax
3b23d1670f Finishes the dnalock framework 2016-05-25 22:20:10 +01:00
Arokha Sieyes
2e263ffc07 Fixes #1655 
Don't snowflake one mode with new(). Setting this on new() causes
weirdness when new() is called (prints unexpected messages to players
about the mode being toggled). If you really want it, define the var as
equal to the bitflag in the definition and update the starting human HUD
to match. Don't change it 'after' if that's always how you want it.
 2016-05-24 12:12:26 -04:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Yoshax
8f7288473a Adds a framework for dna-lockable guns (unfinished) 2016-05-22 17:16:45 +01:00
HarpyEagle
8079b34a27 Updates flashbangs and flash/flare rounds to take advantage of new lighting. 
Main improvement is somewhat brighter flashes, coloured flares.
 2016-05-12 16:21:39 +01:00
Datraen
3fb4620199 Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns 
Buffs Back Pulse Rifles
 2016-05-11 01:51:13 -04:00