cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 5 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

518 Commits

Author SHA1 Message Date
Kelshark
fb47e064d5 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	maps/RandomZLevels/labyrinth.dmm
 2017-04-18 19:25:46 -04:00
Anewbe
2e3bd1f6d9 Adds a lever-action rifle 2017-04-13 15:36:37 -05:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
 2017-04-10 20:41:18 -04:00
Kelshark
4cec8849a2 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	config/custom_items.txt
#	icons/mob/widerobot_vr.dmi
 2017-04-09 09:56:44 -04:00
Yoshax
530a2b5c60 Adds a LeMath Revolver 2017-04-05 14:29:24 +01:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Kelshark
139dbf132c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme
 2017-03-26 00:20:03 -04:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
Arokha Sieyes
805b473976 Polaris Sync Merge 
Fixed Polaris merge conflicts
* Space controller merge conflict
 2017-03-18 00:58:12 -04:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Kelshark
8df7fcd10a Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	.gitignore
#	vorestation.dme
 2017-02-18 09:40:18 -05:00
Yoshax
3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Kelshark
9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme
 2017-02-03 21:35:22 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Kelshark
cecabf1f8f wolfbrigade m8 
also stash fixes
 2016-12-28 21:06:34 -05:00
Kelshark
a32459eb90 Gorillas back in bb 2016-12-28 17:29:25 -05:00
Kelshark
5c967fc7e8 MG42 m8 2016-12-27 19:49:37 -05:00
izac112
fd1033e6e1 p 2016-12-18 04:13:47 +01:00
izac112
8cad7d3927 Here we go 2016-12-18 03:13:37 +01:00
Kelshark
26ce56cda9 guns and other things 2016-12-17 14:09:44 -05:00
Kelshark
5473eae975 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	.gitignore
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
 2016-12-11 13:41:38 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
ForFoxSake
3e0af860e9 Makes the shotgun go off if it's modified while loaded. 2016-12-09 13:22:04 +00:00
Kelshark
e3577ae1a5 Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other.. 2016-11-27 17:33:53 -05:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
 2016-10-20 21:24:07 -04:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Spades
570c2474c3 Fixes w_class of items to be consistent with Polaris update (#636) 
* Fixes w_class of items to be consistent with Polaris update

* Typo
 2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Neerti
6f8603e042 Pulling & Size Fixes 
Fixes inability for mobs to pull certain structures like mining crates.
Fixes w_class numbers I missed.
 2016-09-24 16:18:32 -04:00
Neerti
828dacf485 Centralizes weight class definitions 
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
 2016-09-22 00:51:51 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00
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
Datraen
c391a58ab2 Merge pull request #1909 from Yoshax/heavyguns 
Heavy weapons changes
 2016-06-27 00:09:18 -04: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
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
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
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -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
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
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
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