Commit Graph
25 Commits
Author SHA1 Message Date
Alexis 3b05cd16d3 125 parser errors. 2026-03-06 13:33:54 -05:00
Roxy ebcce8d3fb Fixes for #91029 2025-05-29 16:44:15 -04:00
Majkl-J 225199e26b Moves all the organcode down to obj/item/organ 2025-02-20 00:06:45 -08:00
4fb4a50167 [MIRROR] A red spy has entered the base: Adds Spies, a roundstart antagonist inspired by Goonstation's Spy-Thief (#26711)
* A red spy has entered the base: Adds Spies, a roundstart antagonist inspired by Goonstation's Spy-Thief

* Update code/__DEFINES/role_preferences.dm

* Update code/__DEFINES/role_preferences.dm

* closet fix

* I am stupid

* fix effects

* there we go

* is this the end?

* ugh

* please stop

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: jjpark-kb <mccorvey.norman@gmail.com>
2024-03-23 16:27:57 -04:00
30d7788c35 CIN Evilguns | The gunnenshootening pt 3 | Long live the king | Slight rework of the CIN surplus company (#24304)
* scream if you love poland !!!!

* oh yeah its all coming together

* WAR

* dme fixes before i break everything

* f1

* WHAGG

* expect more similarly poorly named commits in the future

* war pt 2

* ooprs

* sharpshooter icon fix

* that should be everything actually

* i forgot demo mod exists

* deletes now unused ak ammo

* thats not real anymore

* every test failure ever

* reduces the weapon weight of the bobr

* tweaks opfor weapons since they all changed since i last saw them

* fixes the plasma pistols and tweaks their numbers a little

* deletes the luk, delete lanca proj dam mod, decreases lanca firerate

* tweaks the outfits that use these guns a bit and makes the miecz one han

* removes the luk from that one mapping helper

* puts the sakhno back on order

* tweaks around the lanca's ammo capacity

* updates the milsim domain stuff

* fixes some of the stuff

* makes the lanca and miecz magazines not normal size

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-12-01 16:59:27 -05:00
42dbc6d028 Armadyne Antitrust Act 2563 :: Disintegrates armadyne as a concept and replaces basically everything related (#23424)
* oh yeah oh woag

* maybe we can make uncommon into that

* gunnenshooter

* hard work work

* just now realised i forgot inhands

* inhands and worn

* soundsmith tf2

* does the rifles

* puts some of the pistol suppressor images in

* awawawa

* shotgun override apparently

* pistola

* grendae launcher

* dont forget the evil one too

* yeah lets fix that

* oops

* now lets see what kind of errors compiling gives us

* should hopefully be all the compile errors

* i understand morbius now

* surely it will work now

* fixes shrapnel grenades runtiming

* also fixed grenade rangefinding

* how'd I mess thta up

* fixes various issues

* granata!!!

* haha surely this will gow ell

* should fix the grendades for real

* opening this pr then dropping dead

* uhhh fixes some stuff i think?

* armory stuff

* random mapping things pt 2

* blehh :3

* fixes it forever and ever

* whar??

* turns out that needs a tweak

* curious

* that'll work 4 sure now

* fixes vr

* come on over wont you sway with me

* mhm yup

* should hopefully be all that's it?

* missing icons

* makes the rifle more expensive

* makes the smg a little less awful feeling

* dollar store suppressors, just a week away

* mmsmrmmrsgg

* lets the shotguns actually be sawn off

* the propaganda

* hey thats important

* sprite error  (comical)

* gives the casings custom materials for printing

* i love code ordering

* 'lets just be safe' ifies the weight classes of mags and ammo boxes

* reworks the sol defense selection a bit

* Update modular_skyrat/modules/ammo_workbench/code/design_disks.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* act three

* defines

* undefine

* restores the clothing

* some stuff part 3

* fixes the outfit guns not existing

* adjusts firerates and grenade launcher sprites

* fixes .35 sol revolvers??

* slightly un-nerfs the rifle firing rates

* makes the revolver jus tuse the normal sound

* makes the pistol case the right path

* its a machinegun!

* slight little tiny tweaks

* british weather service

* puts the blueshield gun box in their locker

* makes rifle less lethals a bit more normal

* slightly changes the smg burst and firerate

* the pepperball had raygun

* pepperball caliber

* forgot to push the include

* i love testmerges

* revolver sillies

* makes the kiboko's examine_more not just the rifle's

* smallens the eland and enlargens the cost of the kiboko

* lets change the machinegun a bit too why not

* gfl larp (real)

* fixes modular armory templates

* lets cases be ordered dont worry about the other stuff

* makes the takbok say its from the right company

* makes sawn off shotgun suppressors visibile

* those aren't used at all

* tweaks some of the rifle sprites

* shortens the shotgun a bit

* puts the pixel shifting out of initialize to make certain things work b

* granata!!!1!!!

* large number of weapon and ammo tweaks

* windup autofire seems broken somehow?

* fixes the inhands

* outfit sanity

* .40 armor piercing ammo box name correction

* removes var that doesnt exist anymore

* .40 armor piercing rework

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-10-03 11:20:23 -04:00
30d57e41dc [MIRROR] Replaces Camera bug with Camera tablet app [MDB IGNORE] (#23275)
* Replaces Camera bug with Camera tablet app

* Modular changes

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-08-23 16:33:01 -04:00
5fd1f08b7e [MIRROR] Replaces the poster and graffiti objectives with assault and early steal & destroy ones. [MDB IGNORE] (#23235)
* Replaces the poster and graffiti objectives with assault and early steal & destroy ones.

* Update engineering.dm

* Update cargo.dm

* Update mapping_helpers.dm

* Update mapping_helpers.dm

---------

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-08-21 18:18:28 -04:00
4b6c93f6b9 [MIRROR] Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits. [MDB IGNORE] (#17306)
* Easy's Super Omega  "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits.

* Removed all the conflicts, and started converting all the arms and legs to the proper typepaths

* Actually makes the game compile :)

* Makes the maps compile too!

* Early mirror of #71143 because it's more relevant to us

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-11-11 11:44:49 -05:00
7559990f20 [MIRROR] [MDB IGNORE] Shuttle engine code improvement and fixes [MDB IGNORE] (#16116)
* [MDB IGNORE] Shuttle engine code improvement and fixes

* what even happened in shuttlepanel.dm

* should be the last few

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2022-09-10 18:28:57 -04:00
TomandGitHub 7bb6c596b3 fix crate test (#16063)
remove aeg
2022-09-04 19:52:48 -04:00
88c85fe1f7 [MIRROR] [MDB IGNORE] Refactors drinks and fixes a lot of food problems [MDB IGNORE] (#15577)
* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* forgto 2 commit

* im slowly going insane

* why does find and replace not FIND everything

* hnghnnngh

* h

* l

* a

* a

* so close...

* delta fix

* I thought I committed this already, guess not

* this PR has been the bane of my fucking life

* orange juice

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2022-08-25 03:17:10 +01:00
0a1f06a2d1 [MIRROR] This tail refactor turned into an organ refactor. Funny how that works. [MDB IGNORE] (#14017)
* This tail refactor turned into an organ refactor. Funny how that works.

* Firstly, fixing all the conflicts.

* Fixes all our maps (hopefully)

* Actually, this should fix pod people hair :)

* Almost everything is working, just two major things to fix

* Fixed a certain kind of external organ

* Cleaning up some more stuff

* Turned tail_cat into tail because why the fuck are they separate?

* Moved all the tails into tails.dmi because that was just dumb to have like 3 in a different file

* Adds relevant_layers to organs to help with rendering

* Makes stored_feature_id also check mutant_bodyparts

* Fixes the icon_state names of ALL the tails (pain)

* Fixes wagging, gotta refactor most mutant bodyparts later on

* I Love Added Failures

* Fixed some organs that slipped through my searches

* This could possibly fix the CI for this?

* It doesn't look like it did fix it

* This will make it pass, even if it's ugly as sin.

* Fixed Felinids having a weird ghost tail

* Fixes instances of snouts and tails not being properly colored

Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-06-11 23:20:16 -04:00
ORCACommanderandGitHub 2b7fb77093 Fix Crossbow Compile (#12909) 2022-04-19 20:35:21 +01:00
82c37a6d74 [MIRROR] [MDB IGNORE] makes ebows and kinetic accelerators share a parent [MDB IGNORE] (#12902)
* [MDB IGNORE] makes ebows and kinetic accelerators share a parent

* wew

* wew

* Update blackmesa.dmm

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-19 19:58:49 +01:00
58e94861c2 [MIRROR] [MDB IGNORE] 3/4th medkit sprites + firstaid > medkit [MDB IGNORE] (#12034)
* [MDB IGNORE] 3/4th medkit sprites + firstaid > medkit

* Update storage.dm

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-03-13 22:07:44 +00:00
GandalfandGitHub d39349e90b Brings gunsgalore upto standard (#11669)
* nyoom

* e

* oops

* 0

* r

* Delete opposing_force_equipment.dm

* Update blackmesa.dmm
2022-02-22 17:18:17 +00:00
4ef2012a58 [MIRROR] Fixes navigation computers giving too many port jumping actions [MDB IGNORE] (#10761)
* Fixes navigation computers giving too many port jumping actions (#64054)

* Fixes navigation computers giving too many port jumping actions

I'm adding a vestigial proc here, remove_jumpable_port
I prefer this over not fully implementing the behavior, hopefully it'll be of use to someone

* Fixes navigation computers giving too many port jumping actions

* Fixes navigation computers giving too many port jumping actions

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-19 21:12:58 +00:00
58f82b5161 [MIRROR] [Ready] MODsuits [MDB IGNORE] (#10244)
* [Ready] MODsuits

* we dont need to add these people as codeowners, goodness gracious

* have to remove this because upstream

* part 1 of these fixes

* EEEE

* Update peacekeeper_clothing.dm

* E

* E

* Auto stash before merge of "upstream-merge-59109" and "origin/upstream-merge-59109"

* E

* Update expeditionary_trooper.dm

* more removal

* nice

* modsuti modstui modusuti

* fixes

* E

* ITS MODsuit not HARDSUIT

* more hardsuit references

* MODSUIT NOT HARSUITEDSA

* Maps

* More ,map

* oop

* e

* oo aa

* 0

* ting tang

* Update modsuit_tailsprites.dm

* hi fikou

* bs tech update

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-25 13:32:49 +00:00
13d38add93 [MIRROR] Repaths knives to not all be children of the kitchen knife. [MDB IGNORE] (#8843)
* Repaths knives to not all be children of the kitchen knife.

* Fix

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-23 00:07:08 +01:00
26f934c258 [MIRROR] Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton) (#8076)
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)

* EEEE

* E

* follow the fucking guidelines

* E

* Update CentCom_skyrat.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:27:01 +01:00
KathrinBaileyandGitHub b8a60766c6 More prepwork for privateers (PR 2 of 6-ish maybe) (#5620)
* all the stuff

* Update energy.dm
2021-05-13 14:41:02 +12:00
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
f4fd38b1a8 [MIRROR] Aquarium fish improvements (#3069)
* Aquarium fish improvements (#56573)

Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Aquarium fish improvements

* Update mapping_helpers.dm

* Update packs.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 19:36:20 +00:00
90d3dd4f20 [READY] Configurable spawners for event use for admins (#1786)
* aaa

* aaa

* aa

* aaa

* ascsc

* asd

* aaa

* Update event_spawner.dm

* Update event_spawner.dm

* Update event_spawner.dm

* imports and exports

* aaa

* Update event_spawner_menu.dm

* Update event_spawner.dm

* aa

* Update event_spawner_menu.dm

* Update event_spawner_menu.dm

* Update event_spawner_menu.dm

* aa

* faction boys

* Update outfit.dm

* money

* Update outfit.dm

* incredible

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-30 19:51:17 +00:00