Commit Graph

1754 Commits

Author SHA1 Message Date
Nadyr
db68153268 Merge pull request #3231 from CHOMPStation2/upstream-merge-11831
[MIRROR] operation RAD APES
2021-12-05 12:18:12 -05:00
Nadyr
f4a8eebb8e powder that makes you say yes 2021-12-05 11:29:08 -05:00
Casey
cfcbab8941 Merge pull request #11831 from Hatterhat/rad-arm
operation RAD APES
2021-12-03 07:17:59 +00:00
Verkister
98df2abae2 Update explosive.dm 2021-11-11 22:15:01 +02:00
Verkister
6a814f53ac Earlyports rocket launcher fix
Launcher type guns throw the projectile instead of firing it via the advanced rng bullet spaghetti so the projectile had no idea how to go boom.
2021-11-11 22:06:48 +02:00
Chompstation Bot
eef3a58cfb [MIRROR] Adds unique projectile hit messages to simplemobs 2021-10-28 01:07:42 +00:00
Nadyr
4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615
[MIRROR] [MIRROR] Remove suicide act
2021-10-27 21:05:48 -04:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +00:00
Nadyr
4bd02ef673 Merge pull request #3140 from CHOMPStationBot/upstream-merge-11701
[MIRROR] ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
2021-10-27 19:30:01 -04:00
Nadyr
daa50cb5ac powder that makes you say yes 2021-10-27 19:21:48 -04:00
Chompstation Bot
318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00
Casey
0e8d336a1b Merge pull request #11671 from VOREStation/upstream-merge-8328
[MIRROR] Rocket launchers make the projectile when they consume the rocket
2021-10-27 15:39:24 +00:00
Cadyn Bombaci
576545ef47 fix 2021-09-26 10:48:54 -07:00
Cadyn Bombaci
b55c94da13 linter 2021-09-26 10:37:24 -07:00
Cadyn Bombaci
1fa43a5406 compiler fixes 2021-09-26 10:35:18 -07:00
Cadyn Bombaci
4b5d036662 WIP new guns 2021-09-26 10:28:09 -07:00
Razgriz
362caffe59 Merge pull request #2798 from Rykka-Stormheart/shep-dev-compile-errors
Misc DMLang/VSCode Compiler Fixes + Some Actual Compiler Fixes
2021-09-17 03:15:52 -07:00
BlackMajor
464b3dc18e A couple of mapping helpers 2021-09-09 21:07:00 +12:00
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