Commit Graph

1936 Commits

Author SHA1 Message Date
Rykka
ed798113d9 Compiler Fixes
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
2021-09-03 17:22:49 -07:00
Razgriz
9a8c7db57e Update gun.dm 2021-08-30 02:42:20 -07:00
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
2797027a41 Merge branch 'master' into upstream-merge-11426 2021-08-25 22:49:43 -04:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421
Merge Upstream Pull Request 11421
2021-08-25 22:38:53 -04:00
Aronai Sieyes
af8d866e1b Upstream-11426 2021-08-24 21:10:42 -07:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Nadyr
e194abf37c Merge pull request #2852 from CHOMPStationBot/upstream-merge-11449
[MIRROR] [MIRROR] New Shotguns/Rifles
2021-08-24 22:33:48 -04:00
Aronai Sieyes
680587480a Merge pull request #11449 from VOREStation/upstream-merge-8182
[MIRROR] New Shotguns/Rifles
2021-08-24 23:59:42 +00:00
Chompstation Bot
593dd3ea79 Stun Revolver Fix 2021-08-24 23:58:41 +00:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Rykka
096b64ffb1 Changes all pistols to move_delay = 0 via CHOMPEdits
Some of these are probably redundant, I did this quickly in response to a request so it could get in before an event.

I'll do a more thorough move_delay lookover later and determine what weapons should be fire-able on the move vs not.
2021-08-18 14:59:37 -07:00
Rykka
54b0844ff4 Adds custom firing sounds for weapons - Serdy's Request
AKM Variants all use ak74.ogg
Glock uses 9mmpistol.ogg
VP70 uses 40pistol.ogg
Molniya uses molniyab.ogg
Plamya uses plamya.ogg
SKS uses sks.ogg
Type 901 uses type901.ogg
Vityaz uses vityaz.ogg
2021-08-18 14:07:26 -07:00
cadyn
0ab03cf119 fix open bolt guns 2021-08-15 02:55:41 -07:00
Nadyr
47c017bbc0 Merge pull request #2785 from CHOMPStation2/BallisticsAgain
Ballistics again
2021-08-14 21:50:46 -04:00
Nadyr
417424985a Merge pull request #2786 from CHOMPStation2/Razgriz1032-patch-4
Fix m41 magazine caliber
2021-08-13 23:03:33 -04:00
Razgriz
d160a8528c Fix m41 magazine caliber 2021-08-12 22:30:31 -07:00
Razgriz
2ff1958668 More armor pen and buckshot damage 2021-08-12 22:20:36 -07:00
Razgriz
82c5881e28 Bullet penetration update
We don't need big penetration anymore because we are not using the damage system.
2021-08-12 22:02:54 -07:00
Razgriz
5d23c0d5b6 Bring back ballistics
Now with ez "use old damages" change.
2021-08-12 21:45:10 -07:00
Razgriz
dddeb35523 I used the shotgun 2021-08-12 21:11:09 -07:00
Aronai Sieyes
b2fb505121 Merge pull request #11347 from ResidentCody/phoron-bore-shoots-slower
Phoron Bore - Adds Hefty Recoil When Firing
2021-08-06 22:14:42 +00:00
Chompstation Bot
9acfa8fcca SMART Rifle 2021-08-05 21:48:45 +00:00
Darlantan
9604899135 Revert ballistics overhaul 2021-07-30 21:25:04 -04:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
2021-07-20 21:45:26 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
Aronai Sieyes
0f547b6314 Merge pull request #11149 from VOREStation/Arokha/bows2
Bows do damage
2021-07-19 21:40:58 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
3320513c69 Merge pull request #2561 from CHOMPStationBot/upstream-merge-11098
[MIRROR] Add bows, recipe for wooden one
2021-07-15 20:56:26 -04:00
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 20:26:17 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
5843c3776e Add bows, recipe for wooden one 2021-07-15 22:13:21 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
7ddc05bfda powder that makes you say yes 2021-07-09 21:57:23 -04:00
Nadyr
73196eaa8c powder that makes you say yes 2021-07-09 21:55:45 -04:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Aronai Sieyes
bcc80d1bbb Merge pull request #10909 from MarinaGryphon/bracketfixes
Fixes a few issues with brackets being escaped when they shouldn't be.
2021-07-05 16:17:41 +00:00
Nadyr
babb859f5f powder that makes you say yes 2021-07-03 22:11:19 -04:00
Nadyr
6baa72b9e7 Merge pull request #2367 from CHOMPStationBot/upstream-merge-10819
[MIRROR] Swap some guns for Eris ones
2021-07-03 20:46:52 -04:00
Aronai Sieyes
bfb7428426 Merge pull request #10819 from VOREStation/Icons/guns
Swap some guns for Eris ones
2021-07-03 21:14:00 +00:00
Aronai Sieyes
30a01c6490 Merge pull request #10792 from VOREStation/Arokha/portamed
Eris portable freezer, medical briefcase
2021-07-03 20:26:49 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
21e967898d Merge pull request #2275 from CHOMPStationBot/upstream-merge-10729
[MIRROR] Netgun Upgrade
2021-06-25 00:43:28 -07:00
Razgriz
48bf05e801 powder that makes you say yes 2021-06-25 00:27:42 -07:00