Commit Graph
1775 Commits
Author SHA1 Message Date
NadyrandGitHub 1d27bf55c1 Merge pull request #3604 from CHOMPStation2/upstream-merge-12122
[MIRROR] [MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 22:48:48 -05:00
CaseyandCHOMPStation2 a8d3dce15f Merge pull request #12122 from VOREStation/upstream-merge-8385
[MIRROR] Adds caseless BB rounds for common gun types
2022-02-03 06:28:45 +00:00
CyreliusandGitHub 6ecaa54625 Update phase.dm
Add chompedit tags as requested.
2022-01-29 21:00:25 -08:00
CyreliusandGitHub 008bf33299 Merge branch 'CHOMPStation2:master' into master 2022-01-29 16:38:44 -08:00
NadyrandGitHub 656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
CyreliusandGitHub b9cd1eddfe Update phase.dm
Make the borg phase rifle not awful, hopefully.
2022-01-17 12:35:26 -08:00
CyreliusandGitHub d8a8bb736c Robot Taser buff
The taser is trash, and this'll help it a bunch.
2022-01-02 04:01:28 -08:00
Verkister 0014d6a6e6 Adds Honk-Hound
Absolutely cursed in all the right ways~

Also fixed the regular confetti cannon's flaccid throwing performance while at it.
2021-12-31 02:40:35 +02:00
BlackMajor 6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
NadyrandGitHub 3b0e00531d Merge pull request #3313 from CHOMPStation2/upstream-merge-11991
[MIRROR] Makes bluespace harpoon capable of televore
2021-12-12 06:25:11 -05:00
NadyrandGitHub 5534d7e403 powder that makes you say yes 2021-12-12 06:16:15 -05:00
NadyrandGitHub c70ed31f40 Merge pull request #3446 from CHOMPStation2/upstream-merge-11841
[MIRROR] Somatoray Modularity
2021-12-12 05:27:18 -05:00
RazgrizandGitHub 783c579b36 powder that makes you say yes 2021-12-10 01:27:04 -07:00
CHOMPStation2andGitHub 1e358f9752 powder that makes you say yes 2021-12-10 00:17:29 -07:00
CaseyandChompstation Bot 9c7d030128 Somatoray Modularity 2021-12-10 04:33:32 +00:00
CaseyandChompstation Bot c0cc81fbae SD QOL update 2021-12-10 03:21:22 +00:00
BlackMajor 4b247c48d4 fix a couple of missing icons 2021-12-10 16:07:53 +13:00
CaseyandChompstation Bot 3ff1fc8beb You can't eat yourself, charlie brown! 2021-12-08 20:07:14 +00:00
BlackMajor dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
NadyrandGitHub db68153268 Merge pull request #3231 from CHOMPStation2/upstream-merge-11831
[MIRROR] operation RAD APES
2021-12-05 12:18:12 -05:00
NadyrandGitHub f4a8eebb8e powder that makes you say yes 2021-12-05 11:29:08 -05:00
CaseyandChompstation Bot cfcbab8941 Merge pull request #11831 from Hatterhat/rad-arm
operation RAD APES
2021-12-03 07:17:59 +00:00
BlackMajor 636659d6a7 icon fix 2021-11-27 09:38:32 +13:00
BlackMajor a3bb4b9b5a Early pr 2021-11-26 15:35:21 +13:00
VerkisterandGitHub 98df2abae2 Update explosive.dm 2021-11-11 22:15:01 +02:00
VerkisterandGitHub 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
NadyrandGitHub 4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615
[MIRROR] [MIRROR] Remove suicide act
2021-10-27 21:05:48 -04:00
Aronai SieyesandChompstation Bot 0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +00:00
NadyrandGitHub 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
NadyrandGitHub 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
CaseyandChompstation Bot 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
RazgrizandGitHub 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
RazgrizandGitHub 9a8c7db57e Update gun.dm 2021-08-30 02:42:20 -07:00
NadyrandGitHub 67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
NadyrandGitHub 2797027a41 Merge branch 'master' into upstream-merge-11426 2021-08-25 22:49:43 -04:00
NadyrandGitHub f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421
Merge Upstream Pull Request 11421
2021-08-25 22:38:53 -04:00
Aronai SieyesandCadyn af8d866e1b Upstream-11426 2021-08-24 21:10:42 -07:00
Aronai SieyesandCadyn 72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai SieyesandCadyn e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
NadyrandGitHub e194abf37c Merge pull request #2852 from CHOMPStationBot/upstream-merge-11449
[MIRROR] [MIRROR] New Shotguns/Rifles
2021-08-24 22:33:48 -04:00
Aronai SieyesandChompstation Bot 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