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
30,805 Commits 8 Branches 0 Tags
09788190c220a9cfaa636d63f06820975d026ef5
Commit Graph

899 Commits

Author SHA1 Message Date
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
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
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
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
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
Anewbe
ac3ce2e7d1 Makes borgs more versatile 2016-05-07 23:52:03 -05:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Datraen
3baf91b46e Merge pull request #1307 from Neerti/3/30/2016_dumb_gun_balance 
Dumb Gun Balance Patch
 2016-05-01 17:42:25 -04:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound. 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2016-04-22 04:58:25 -04:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Neerti
3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance 
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
 2016-04-20 05:41:36 -04:00
Yoshax
ff96d27a85 Adds a new verb that allows users to toggle the requiring help intent to fire weapons on or off 2016-04-16 18:30:35 +01:00
EmperorJon
ff6526d5a3 Merge pull request #1424 from Neerti/4/16/2016_aim_intent_changes 
Aim Intent Changes
 2016-04-16 17:13:16 +01:00
Neerti
da53a9ea60 Aim Intent Changes 
Manually ports https://github.com/Baystation12/Baystation12/pull/12614 's fix to not make examining trigger the autofire.
The toggle to shoot if the target talks on the radio defaults to off.
The aim intent icon now updates when clicked.
 2016-04-16 02:30:47 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port 
Ports Bay's new inventory system.
 2016-04-16 02:58:07 +01:00
ParadoxSpace
582fd09624 Update pulse.dm 2016-04-09 18:09:35 -06:00
Anewbe
d2318ca1b2 Spike regen rate changed 2016-04-07 16:38:42 -05:00
Neerti
25c04df5bd Polaris tweaks. 
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
 2016-04-06 07:48:09 -04:00
EmperorJon
1e20f816ad Merge pull request #1348 from Neerti/4/4/2016_lwap_nerf 
Laser Snipers no longer stun on hit.
 2016-04-04 15:07:07 +01:00
Neerti
53c16f02bb Laser Snipers no longer stun on hit. 2016-04-04 04:02:52 -04:00
Neerti
151082343b Firing a gun while cloaked will now unclock you. 2016-04-03 18:20:07 -04:00
Neerti
75c0c5cc38 Changes lots of gun stuff, see PR for details. 2016-03-30 03:41:54 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Mark9013100
e62863e1b3 Renames the security .45 2016-03-22 23:03:21 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Datraen
129965b1c4 Adds a variable to check for grenade loading, makes frags unloadable. 2016-02-16 12:58:17 -05:00
Neerti
6b4896f886 Rubbers and beanbag rounds will now respect armor, melee armor specifcally. 
Rubber round damage halved.
 2016-02-08 01:19:17 -05:00
Zuhayr
c8c10e9741 Blindness will now interrupt aiming. 2016-02-07 17:38:47 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Zuhayr
408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across 
the board.
 2016-01-31 11:49:14 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30