Commit Graph

539 Commits

Author SHA1 Message Date
Byemoh
cffdd4921f late awaken traitors get voices in their head for flavor (#19084)
* might b cool

* ynot

* Update traitor.dm
2023-06-19 09:00:30 -04:00
John Willard
051b3face4 Fixes and improves some parts of the nerd suit (#19180)
Fixes the death signal, clears out owner on the suit's Destroy, replaces the emagged var with using the EMAGGED object flag, replaces the 3 beep defines with one that covers all 3 (one was removed though since it was unused), and replaces the if else health percent checks with a switch statement.
2023-06-11 22:37:08 -05:00
Scrambledeggs
064ac23dfa Constable clothing and equipment for Security (#18833)
* Adds constable's whistle, action, and sound

* Adds constable headgear

* Corrected typo

* Adds constable suits

* Fixed another typo

* Adds constable uniform

* Adds billy club

* UI wrist strap and lowers whistle volume

* Added to wardrobe and cargo

* Fixed yet another typo

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/clothing/neck/_neck.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Fixes and Cuackles recommendations

* I have no idea what I'm doing

* Fixes merge conflicts

* Sprite Mergefix

* Reorganized code and whistle sprite fix

* Tattax's recommendations

---------

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2023-06-08 22:01:45 -05:00
Manatee
03c3a72378 The Grimdark Arsenal (#16843)
* Initial commit

* initial attempt at lasguns

* lasgun mag (?)

* Finishes all four las weapons

* flamer sprite changes

* couple sprites

* Bolt Pistol, Plasma Fix, Cargo Crates, and Flamer groundwork

* Initial groundwork for ERT

* UNIFORMS AND ERT!!

* who tf uses spacebar to indent...?

* Bolt pistol and outfit fixes

* no use for a flamer, whatever

* cargo packs

* New Imperial Chainsword and ammo crates

* Inhand sprites

* attempt at fixing merge comflic

* plasma rifle is YUGE

* Plasma guns work, fixes issues with projectiles

* whoops this didnt save

* more fixes

* more bug fixing

* capitalization

* Update packs.dm

* Update imperial.dm

* better grouping of names for admin spawning and testing

* oh i never pushed this

* Capitalization

* Spelling and capitalization (2)

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/cargo/packs.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Update code/modules/clothing/outfits/imperial.dm

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* Apply suggestions from code review

spelling

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>

* makes lasers less retarded

* making lasers less retarded

* uses adjust_fire_stacks

* uh oh im retardewd

* cooldown instead of prob

* idk how cooldowns work

* ok maybe this works

* guns no longer buyable

* not orderable

* icon updates

* more sprites

* commissarial drip

* those looked dumb anyways

* i forgor

* fixed that

* Merge conflict resoloutions

* ok fr this time

* FUCK MQUIB

* removes flamer sprites i forgor

* new sprites by baiomu (yes)

* ugh

* wtf is that even idk

---------

Co-authored-by: Redd <36747151+ReddicusDragon@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
2023-05-28 22:40:11 -05:00
solwashere
34cbe927ce Changes the vxtvul hammer sounds to be more impactful (#18553)
* adds sounds

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Delete electrichum.ogg

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
Co-authored-by: Thomas <36747151+ReddicusDragon@users.noreply.github.com>
2023-05-27 22:51:00 -05:00
Kaithyl
5264b2ee81 Nanotrasen Inspector booth (#18622)
* Initial Commit

Initial Commit

Added machine+boards, draggable component.

Moving components test

Added css transitions and test sprite

Sound test

Added several audio files

Added stamp animations

Changed tray rendering to using segmented icons and added new sprites

Fixes timing and component highlighting bugs

Redid dragging components

Items in booth can now save position and parse HTML

Added shared z-indexing, switched to better HTML sanitizer

Stamps on papers now properly scale with screen size

Began moving inline CSS into InspectorBooth.scss

Stamping functional

Added functionality for taking and ejecting items

Item dispensing and size change test

Finished UI elements for desk and speaker

Bug fix for z-indexing when small and component initialization

Added experimental reflections

Fixes reflection opacity stacking

* Finished id cards

* Added more sprites

* Made stamp tray upgradable

* Added sprite for the inspector booth machine in game

* Added some part upgrades

* Bug fix for intent interaction with booth

* Increased range for speaker

* Add cast from field to photo first for linter
2023-05-25 22:09:18 -05:00
tattax
c2b299cf7e space dragon qol, refactoring and misc (#18625)
* this shit sucks

* tes

* 2

* 3

* s

* e
2023-05-25 21:16:13 -05:00
SapphicOverload
1d76937c07 IPC Revival Rework (#18953)
* beep boop

* forgor to remove the old stuff

* uh oh, good thing i caught this

* guide
2023-05-23 17:07:19 -05:00
Xoxeyos
aea292c127 Adds some netherworld mobs for mapping, bus, etc. (#18680)
* Update netherworld.dm

* lazy upload

* adds my new mobs

* creature death
2023-05-23 16:38:03 -05:00
Skrem_7
dbfb558b4e mateba is now .44, some deagle buffs (#18879)
* mateba is now .44

* Update TGS3.json??
2023-05-23 16:37:13 -05:00
Skrem_7
37bf64dcdd oh boy new sounds (#18845) 2023-05-15 21:02:02 -05:00
Skrem_7
e3b3a24e10 Adds the Winton Mk. VI Repeating Rifle, liberalizes bandoliers (#18676)
* adds the winton repeating rifle

* adds some spaces i forgot

* adjusts big crate desc, reduces prices significantly

* ticks the prices of the gun itself back up just a tish

* arrows can't go on bandolier!
2023-05-09 13:03:43 -05:00
Molti
37e76e61bf Ports flying bloodsplatters from TG from Hippie for wounds (#18530)
* added, time to fix bugs

* requirements

* fix runtime

* yog changes

* Update atoms_movable.dm

* forgot this (very important)
2023-05-02 00:53:52 -05:00
Molti
f6a78df87d Makes fairy boots nullrod more faithful to the source material (#18601)
* Update holy_weapons.dm

* Update holy_weapons.dm

* sound
2023-04-23 23:42:33 -05:00
Redd
c526bfa402 Ports TG paystands (#18619)
* adds changes to id cards to prep for paystand update

* Create cashregister.ogg

* teehee

* fixes lack of tgui_input_number

* adds holopay.tsx

* ports tg paystands

* adds locking to wrench bolts

* you can now craft cash registers

* Update HoloPay.tsx
2023-04-23 23:39:22 -05:00
Ling
04d215d1db Ports the Hypertorus Fusion Reactor: Fusion in a machine (#17815)
* test 1

* Big update

* Remove broken atmos grenade

* Fix heat exchanger runtime

* HFR fixes

* Dynamic canister light

* Shitty yogs edit

* Better map

* Add corners

* Better canister lights

* Change item order

* Fix linter

* Fix duplicate defines

* Update binaries

* Revert config change

* Try this lib

* Fixed and re-added passive vents

* Betterer canister lights

* Refactor water vapor reaction

* Adds anti-nob effect to SM

* Overhaul pluonium_bz_response reaction

* Add helium text effect

* Small formatting fix

* Remove rad limit

* Fix gas icons

* Add rad signs

* Maybe better rad calc

* Even betterer

* Fix crack runtime

* Update map

* Merge nitryl and stimulum into nitrium

* Better nitrium everything

* Better nitrium formation

* Remove machine frame from incin

* Remove helium and overhaul HFR recipes

* Fuel update

* maybe fix linter

* linter 2

* fuel update

* Linter happy

* Lower stim effects requirements

* how did this happen

* fuck

* Nerf rad generation

* Add HFR to Yogsmeta

* Add HFR to AsteroidStation

* Add HFR to Gax

* Remove ghost atmos closer

* Add more radiation lockers on meta

* Update atmos areas

* Alt box HFR room

* Continue updating atmos areas

* Rename gas storage to foyer

* Maybe fix error

* important change

* Fix mix tank area

* Fix power cable on yogs

* Move meta scrubbers

* Add port to HFR on yogs

* Add better high mole broadcast and fix instant delam

* Add more fire extinguishers to incin on yogs

* Add extinguishers on gax

* Fix camera on asteroid

* Update asteroidstation

* Add more fire extinguishers

* Fix error

* Update gax

* Change asteroid toxins vent

* fix gax

* fix gax 2

* bring it back

* also this
2023-03-27 12:53:15 -05:00
Redd
64726b0798 Changes lizard hiss and increases staff, mentor, and donor retention by allowing felinids to hiss. (#17814)
* adds sound

* felinids can hiss

* felinids can purr

* You can no longer purr at people

NanoTrasen has noticed an increase in harassment complaints from stations that employ felinids. The reports indicate that felinids would purr at people. NanoTrasen has since banned workplace purring at people.

* removes purring

* update lizard hiss
2023-02-11 16:39:26 +00:00
SapphicOverload
f286bdb997 you are a good (#17805) 2023-02-11 16:36:12 +00:00
BurgerLUA
717419dcd9 Adds the D.O.T.A. suit. (#16963)
* Morphine administered.

* no wonder it compiled with no errors lmao

* wow it actually works

* removes useless stat that seems to do nothing

* done

* forgot to save this

* fixes the damage handler not working

* requested changes, tweaks some voiceline chances

* suit doesn't restrict speech when emagged

* changes the suit sprites to be better

* the suit now properly hides gloves, shoes, and jumpsuits

* Apply suggestions from code review

Co-authored-by: Ling <lingbleed@gmail.com>

* requested changes

* requested changed

* oops

Co-authored-by: Ling <lingbleed@gmail.com>
2023-01-07 14:45:54 +00:00
Molti
eb0785eabe Tweaks to IPC martial arts (#16971)
* Tweaks to IPC martial arts

* bullet stuff

* Other tweaks

* remove one gibs from execute, two is enough
undefine forgotten ability

* new dash sound

* servostep louder

* rename and thing
2022-12-17 14:45:58 +00:00
Bop
609850a54e Add a new advanced decontamination storage and suit storage snit QoL tweaks [REVIVE] (#16584)
* test

* done

* lastly

* shocking

* bit

* span span

* change

* delete other things

* no it was green

* forgot one decal

* sprites slightly adjusted

* bugfix

* reverse

* ⠀⠀⠀⠀⠀⠀⠀⣠⣴⣶⣿⣿⣷⣶⣄⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⣾⣿⣿⡿⢿⣿⣿⣿⣿⣿⣿⣿⣷⣦⡀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⡟⠁⣰⣿⣿⣿⡿⠿⠻⠿⣿⣿⣿⣿⣧⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⣾⣿⣿⠏⠀⣴⣿⣿⣿⠉⠀⠀⠀⠀⠀⠈⢻⣿⣿⣇⠀⠀⠀
⠀⠀⠀⠀⢀⣠⣼⣿⣿⡏⠀⢠⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⡀⠀⠀
⠀⠀⠀⣰⣿⣿⣿⣿⣿⡇⠀⢸⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⡇⠀⠀
⠀⠀⢰⣿⣿⡿⣿⣿⣿⡇⠀⠘⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⢀⣸⣿⣿⣿⠁⠀⠀
⠀⠀⣿⣿⣿⠁⣿⣿⣿⡇⠀⠀⠻⣿⣿⣿⣷⣶⣶⣶⣶⣶⣿⣿⣿⣿⠃⠀⠀⠀
⠀⢰⣿⣿⡇⠀⣿⣿⣿⠀⠀⠀⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠀⠀⠀⠀
⠀⢸⣿⣿⡇⠀⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠉⠛⠛⠛⠉⢉⣿⣿⠀⠀⠀⠀⠀⠀
⠀⢸⣿⣿⣇⠀⣿⣿⣿⠀⠀⠀⠀⠀⢀⣤⣤⣤⡀⠀⠀⢸⣿⣿⣿⣷⣦⠀⠀⠀
⠀⠀⢻⣿⣿⣶⣿⣿⣿⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣦⡀⠀⠉⠉⠻⣿⣿⡇⠀⠀
⠀⠀⠀⠛⠿⣿⣿⣿⣿⣷⣤⡀⠀⠀⠀⠀⠈⠹⣿⣿⣇⣀⠀⣠⣾⣿⣿⡇⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿⣿⣦⣤⣤⣤⣤⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠻⢿⣿⣿⣿⣿⣿⣿⠿⠋⠉⠛⠋⠉⠉⠁⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠁

* cool add

* kol

* done

* you cant see them

* final

* unga bunga

* FUCK

* f

* finish

* use smart fridge ui

* fix

* forgot

* thanks biomu

* final fix
2022-11-26 12:46:46 +00:00
Mqiib
b11ebb0046 GIANT MECHS WITH SWORDS WOOOOOO (#16234)
* mostly just on select and unselect stuff

also makes the new file

* Progress

* rename

* IT ALMOST COMPILES

FIRST TRY BABY

* cleanup

bed time

* use the name

* Now with slashing sprite!

* fix

* pretty much done

* missing override

* plus axe and ifst

* dont doublekill people

* an

* reduce combat mech damage

* SOUND

* comment credit or whatever

* axe buff

* tehc web

* parentheses

* im going insane

* the pain never ends

* sprite n sound fix

* oh my god its done probably

* MARAUDER AND SMALL FIXES

* moar better sprites

* small fixes + mech suit change

* Various bugfixes and tweaks

* More feedback + wall break fix

* bump fix for centcomm

* play sound oops

* Sound amp + axe buff + wording

* more damage

* Pacifism fix + comments
2022-11-19 14:09:07 +00:00
Molti
4a5ae22cfe Thinly veiled reference implant (#16256)
* Thinly veiled reference implant

* Actually adds the icons and requested changes

* autosurgeon no longer one use

* tweaks to the emp effect

* Lets martyrs buy it too

* makes attack speed noticeable

* adds trigger sound effect

* adds a cooldown to the sound effect
2022-10-30 17:48:36 +00:00
Bop
2ab8f3d52f Replaces old axolotl sound with a better cute sound (#16123)
* Chanhe

* replaces sound

* e

* oh uye

* volume
2022-10-22 13:44:36 +01:00
Redmoogle
2801b92eae normalization (#15869) 2022-10-01 12:57:46 +01:00
Skrem_7
05f6818e94 The Ballistics Expansion (#15675)
* Gee I sure hope this PR never stacks an obnoxious number of cornflakes that force me to make a new PR

* forgot to adjust metalshock description

* i forgot to change magtype of the boarder!!

* USE your sprites damnit

* redundancy my beloved

* mild number tweaks

* first patch

* second patch

* small sprite changes

* third patch

* bullet speed patch

* gives ap to wt incend since it doesnt inherit it unlike the rubber

* makes trac less bad

* minor description oversights
2022-10-01 12:37:37 +01:00
Bop
1eba0475a4 Big slap hand fix (#15627)
* oh fbauh8fhwai fuck

* aye

* aaa
2022-09-05 10:46:17 +01:00
Bop
e573d791d0 [PORT] Table smacking (#15547)
* EAEAE

* e

* ea

* no

* anea

* NO SLAPPING ACROSS MAP
2022-09-04 15:13:31 +01:00
ChesterTheCheesy
92afd455d6 Adds Plastic Chairs (#15458)
* Update chair.dm

* Update sheet_types.dm

* Add files via upload

* Add files via upload

* removes accidental asymmetry, looks even better now

* un-deletes some other stuff

* adds motivation to the game

* makes sitting in the chair for longer than a minute motivate you

* adds a very motivating song

* adds Bury the Light to licensed songs

* i need to find how licensing works

* whoops forgot to change one test value
2022-08-29 21:05:54 +01:00
ChesterTheCheesy
d36eda8e77 Gives rocket launcher a pickup sound (#15496)
* gives rocket launcher pickup sounds

* Add files via upload
2022-08-29 12:44:30 +01:00
nmajask
6a8c97ae82 Ports desk bells and ashtrays (#15407)
* stuff

* maps

* fix
2022-08-28 16:28:43 +01:00
ChesterTheCheesy
400e3d8074 Adds Ricoshots (makes flipping coins deflect energy projectiles) (#15399)
* bish bash bosh

* adds that funky flash

* ping sound straight ripped from Ultrakill with no shame

* SECONDS

* Update code/modules/mining/ores_coins.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* uses INVOKE_ASYNC() instead of spawn()

* Makes the flash more funkier

* Update code/modules/mining/ores_coins.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* does a flip for early return

* ugh

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2022-08-28 15:54:51 +01:00
SuperSlayer
4698799877 Ports Space Dragon rework (#13684)
* Coggers

* Update space_dragon.dm

* Update code/modules/events/space_dragon.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update space_dragon.dm

* Update space_dragon.dm

* Update code/modules/events/space_dragon.dm

* Work normally please

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update code/modules/mob/living/simple_animal/hostile/space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update code/modules/mob/living/simple_animal/hostile/space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update code/modules/mob/living/simple_animal/hostile/space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Update space_dragon.dm

* Carpdragon hide

* Update code/modules/antagonists/space_dragon/space_dragon.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/antagonists/space_dragon/space_dragon.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/antagonists/space_dragon/space_dragon.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/events/space_dragon.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update space_dragon.dm

* #61539

* Update animal_defense.dm

Co-authored-by: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-08-05 13:08:16 +01:00
nmajask
360370b599 Surgery tweaks 2 (#14737)
* stasis nerf

* aaa

* a

* a

* pain

* a

* wrapping up

* forgot to revert this

* pretty filter

* ctrl c ctrl v fails me again

* *scream

* spriting

* fex

* dont need this

* Surgical mat nerf

* pain
2022-07-24 12:18:30 +01:00
nmajask
0fb400104a Ports hyposprays MK. II (#14814)
* cit hypos

* pain, suffering even

* maps too

* kilo as well

* delta fix

* syndicate hypospray + kit

* qmc sprite

* red crosses bad

* agh
2022-07-16 16:08:47 +01:00
AlvCyktor
80447767a8 Adds sound effect to lighters (#14652)
* sounds

* code

* forgot some stuff
2022-07-01 23:56:14 +01:00
ynot01
6d0f39b469 capitialism is no longer 1m+ long (#14532) 2022-06-21 23:20:06 +01:00
nmajask
55f49c54cb Ports "Revives "Adds sound effects to surgeries"" and others (#14390)
* surgery sounds

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-14 18:31:20 +01:00
Chubbygummibear
6c24bbc9a6 wacky (#14318) 2022-06-11 15:06:15 +01:00
nmajask
8d5235713c Bones, Bows, and Bamboo - Ports "Tribal crafting expansion", "Adds bamboo walls, stools, benches, recolours and resprites existing bamboo items" and other assorted Bee PRs [IDB IGNORE] (#13634)
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Adds brig physicians

Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.

* Fixed some stuff

- Fixed some stuff I forget to change on some maps
- Added new landmark icons

* Removed Brig Physician's ability to be an antag

Removed Brig Physician's ability to be antag and gave them a mindshield

* Many requested changes

- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744

* Another bunch of changes

- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict

* Might fix one of the merge conflicts

ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun

* Should finally bring this back to a functional state

Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff

* Thought I fixed this

- Fixes the Brig Physician's skill capes using the wrong job

* Should fix wejengin2's issues with the maps

Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary

* Bows, bamboo, and bones

Ports the stuff

* Before i get yelled at

* ack

* Some sprites I forgot to save

* Syndicate bow

* Map changes

* Other bee ports

This might be a bit too much to add

* Fixes invisible bows in Fastdmm2 and a build error

* oops

* Some tweeks/fixes

* More stuff

Added more footwraps, ported tribal skirts, and fixed hardlight bows

* merg

* oops

* aaa

* Gramger

Thanks Anvilman

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Revert "Merge branch 'yogstation13-master' into tribal-crafting-port"

This reverts commit b0396f5085, reversing
changes made to 3085d93160.

* Revert "Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port"

This reverts commit 32967243c7, reversing
changes made to b0396f5085.

* Fix

* More fix

* removes some stuff

for now

* fixed dart guns

* Embed stuff

pain

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* ADMIN LOG: A

* fixes

* pain

* less debug

* Readd the changes

* balance

* hardlight bow stuff

* bamboo

* starting recipes and stuff

* More clothes

Ports some stuff

* Adds the clothing to the map

* balance

* Slug fix

* MELEE!

* Crossbows

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Hardlight bow arrow embedding

* Ashwalker nest tweaks

* Balance

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Bow fixes and minor balance changes

* Im dum

* fix

* Update code/modules/projectiles/boxes_magazines/_box_magazine.dm

* reorganized crafting menu

aaaaaa

* huh

* fex

* removed broken code

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-11 14:58:17 +01:00
Byemoh
c884a992ed Adds fishing for real this time (#13622)
* Fishing

* test

* put fish in your damn hands

* fish types and bait types and

* fixing things

* Update rods.dm

* more stuff

* ok

* yes

* all this stuff

* Update _basemap.dm

* Update game_options.txt

* Apply suggestions from code review

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* component

* move fishing

* Update yogstation.dme

* new icons

* yeah does what tatax yeah

* um new fishing cloths

* working more

* Update fishingbonus.dm

* yeah

* yup

* um ok

* Update fish.dm

* Update fishing.dm

* yep

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-06-11 13:45:56 +01:00
SuperSlayer
1686764c32 Ports some funni midround rulesets from TG (#13971)
* Sussy baka

* Update blob.dm

* Update blob.dm
2022-05-21 12:58:24 +01:00
TheRyeGuyWhoWillNowDie
584cca5b9e skeletons can now rattle their bones (#14001)
* add sound effect and species check

* add the sound effect

* skeletons can now rattle their bones

* oopsie
2022-05-05 20:41:43 +01:00
Simplehorror
179fd29059 add back the old ambimalf.ogg (#13902)
* Add files via upload

* Add files via upload

* Update Space_Station_13_areas.dm
2022-04-30 14:22:34 +01:00
nmajask
f664f6bab8 Adds more makeshift items (#13374)
* Adds more makeshift items

Adds more makeshift tools and weapons

* Forgot the important stuff

Now it should be locked behind syndicate crafting

* horror files and fixes

fun

* merge conflict

* ack

* Fixes, cleanup, and tape gags

aaaaaaa

* pain

* Update mask.dmi

* Update code/game/objects/items/kitchen.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/game/objects/items/devices/multitool.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/game/objects/items/devices/multitool.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-04-30 14:05:59 +01:00
Manatee
a8188125f9 [admin] A smite for dealing with slow thinkers (#13857)
* this doesnt work

* Made it actually function

* makes it louder, and not pitch randomly

* Puts the sound in a better location, and adjusts the path
2022-04-24 13:49:04 +01:00
Jamie D
e1dfec29fd Project Jamie - Paperwork Edition (#11741)
* Innit

* 2

* Update code/modules/paperwork/faxmachine.dm

* Fixed naughty globals

* Make linter happy

* Fix barrier tape

* Fix carbon paper

* Fixes paper shredder, and some of paper budle

* Started moving fax machine to tgui

* Basic UI, faxing works, but admins can't view/reply

* Fax machines work now, you can send your ass to CC

* Started adding fax machines to the map

* Dont delete new stuff

* Update 1

* Update 2

* Various fixes for faxes and paper

* AltClick

* Alt click

* Update code/game/objects/items/barriertape.dm

Co-authored-by: Byemoh <baiomurang@gmail.com>

* Its been a while

* oopsie Compile good.

* oopsie

* Spacing an QM

* Adds to lockers and belts

* Semantics - Anvil

* I FORGOT BORGS

* Few spans

* Update code/modules/paperwork/faxmachine.dm

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

* Update code/modules/admin/topic.dm

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

* Update code/modules/admin/topic.dm

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

* Compile

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
2022-04-21 12:19:40 +01:00
tattax
74147777a8 Ports Bloodsuckers and Monster Hunters from Fulpstation (#13273)
* bs and mh

above

* updoot

d

* fix 2

* updoot 3

* updoot 4

* updoot 5

* quick psosible fix

* updoot 6

* quick fix 2

* pr updoot (probably)

* updoot 7

* possible maybable fix

* second maybable possible fix

* should work for checks

* updoot 8

* attempt 2

* mindslave hud

* reupdates hud.dmi

* quickfix 1

* hotfix 2

* quickfix 3

* quickfix 5

* quickfix 4

* quick fix 6

* clean 1

* quickfix 7

* quickfix 8

* turns all clans flavor only

* code improvement + fixes

* things i forgot

* Revert yarn

* fix to huds

* quickfix 9

* quickfix 10

* quickfix 11

* quick fix 12 (the lugening)

* fuck

Co-authored-by: Theos <theubernyan@gmail.com>

* d

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* p

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* saves yogstation

* penis

* why can't we have nice things

* quickfix 13

* ssssssssss

* hell

* summon traps

* this probably is a good idea

* heolp

* merge master into poggy

* Revert "merge master into poggy"

This reverts commit c346759195.

* amogus

* possibly fixes the gamemode idk it compiles

* makes stuff not cringe

* i hate webeditor

* i hate webeditor

* i hate webeditor

* fixessss

* ducky

* 2

* o

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
2022-04-10 12:28:02 +01:00
nmajask
9876fd7342 Ports the sounds (#13497) 2022-03-27 13:33:44 +01:00
Maxim
7cb0a04fc7 PORTS NSV POOLS FOR REALSIES THIS TIME (#13250)
* Merge branch 'yogstation13:master' into pools

* re-map pools

* fix luxury pool

* some more map changes

* spelling changes

* map changes
2022-02-12 18:28:40 +00:00