Commit Graph

5700 Commits

Author SHA1 Message Date
Chubbygummibear
54e8a8e7fa Bloodsuckers objective tweaks and added epilogues (#14837)
* finally

* skrem writing

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

* skriting

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

* skriting

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

* i just now learned how to batch suggestions

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

* ttt code

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

* never forget

* undoing broken code just in case

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-07-23 12:39:55 +01:00
GraveHat
e23fdfc746 Adds new Blood, Bone, and Brain Mutations (#14836)
* Adds 3 new mutations to body.dm

Mmmmmghn genetic variety.....

* Commits suggested change 1

Don't really understand the meaning behind the question marks but if it runs better then it runs better.

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

* Commits suggested change 2

if that check isn't needed then be my guest.

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

* Commits suggested change 3

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

* Commits suggested change 4

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

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-07-23 12:33:45 +01:00
LazennG
6e1ac67447 you can now go full undertale mode with the flower tendril loot (#14944)
* New tator item: Air Shoes

New 'air shoes'
-intended tot item for 4-5tc
-functionally wheelys that can ollie as well
-slight maneuverability in 0g just like moths

Co-Authored-By: Byemoh <5091394+ToasterBiome@users.noreply.github.com>

* things changed

-tried giving them the ability to ollie but botched it and idk how
-nvm baiomu told me

* Update scooter.dm

sparks appear on activation of shoes

* making it so if atmos is ok and gravity is gone yo can still move

* LAST THING DIDNT WORK

trying tje walk in pressurized thing again

* what do you MEAN UNDEFINED VAR

* stole from mothcode again instead

fuckin indentationerrors

* Update miscellaneous.dm

* fuck it dealing with this part later

* SPRITES BABEY

airshoes have proper worn/item sprites now

* changing shoe toggle sprites

toggling them on has its own sprite, but working on getting the ollie one to work properly

* another shot at the movement in 0g

second attempt at allowing movement in 0g and atmos

* headache part 4

* Update miscellaneous.dm

* messed up vehicle sprites

added in icons for riding but sprites are a bit buggy atm, will replace later when replacements come in

* trying to figure out why a button wont change

* got it

no longer skateboard ollie

* just had a worse idea

gonna replace noslip with something else

* yes its dashing

* jorts

* jorts 2

* vehicle sprite

* last sprite thing

added custom sprite for shoe dash

* shoes can be renamed now

* Update miscellaneous.dm

* other actions now available+fixed sprite mistake

-removed a redundant line stopping the action from being recognized
-removed old shoe vehicle sprites so there's no shoes on top of shoes

* Update miscellaneous.dm

* fixed a problem

walking while dashing used to just interrupt the dash so i just made the dash happen faster

* why does this keep happening when i merge master god

* think thats all the code?

* orca fixed my sprite at gunpoint

* think the code's finished?

* WHY THE FUCK WERE THESE GONE

* Update necropolis_chests.dm

* literally 1984

Co-authored-by: Byemoh <5091394+ToasterBiome@users.noreply.github.com>
Co-authored-by: ToasterBiome <baiomurang@gmail.com>
2022-07-23 02:20:46 -04:00
Vaelophis Nyx
d8dcec7468 meme hat 2 (#14932) 2022-07-23 02:17:40 -04:00
Byemoh
f0a5d075fe weaver (#14890) 2022-07-17 20:32:42 -04:00
nmajask
39fb5ce203 [s] Hypospray patch (#14878)
* agh

* fex
2022-07-16 16:33:41 +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
ynot01
750ee7ed99 refill medipen recipes (#14761) 2022-07-16 15:42:05 +01:00
Redmoogle
43b76877b4 Rad storm takes out telecomms (#14759) 2022-07-16 15:41:40 +01:00
Redmoogle
0110136a0a Radstorms will trigger emergency maintaince with no living heads or AIs (#14760)
* Rad Maints

* Update radiation_storm.dm

* ok

* Update radiation_storm.dm
2022-07-16 12:58:06 +02:00
Byemoh
ed84297f0a ok ports it right (#14806) 2022-07-16 12:42:22 +02:00
Vaelophis Nyx
8ef20ee84a Adds new Lavaland Biodome Ghost Spawn: The Fisherman, in a Fishing Pier Biodome (#14746)
* e (#14639)

* Initial commit. Add map, spawns, fix fishing vendor.

need new sprite for the fishing vendor restock.

* e

* Boat can now do water!

splish splash

* fishermen can now access their own shutters and lockdowns

:)

* north entrance exists now

e

* fix button access for real this time

fastdmm I hate you

* less vendors, moved some stuff

* updates that one table to be wood

now its less ugly?

* uses the new donkpocket spawner

RNG donks lets go

* fishing restock finally

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-07-16 05:22:03 -04:00
Redmoogle
e53709d1f8 Update uplink.dm (#14754) 2022-07-09 17:10:46 +01:00
Jamie D
800ca93b35 Sterilizes the codebase - Pt.6 Dwarfism now permanently gives you dwarf beard (#14719)
* Update body.dm

* Update code/datums/mutations/body.dm
2022-07-09 11:27:36 -04:00
Jamie D
8846e994a0 Update slash.dm (#14716) 2022-07-09 16:09:37 +01:00
ynot01
b031a87f28 craftable epi and atropine medipens (#14710)
* medipen crafting

* typepath typo

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

* Update code/datums/components/crafting/recipes.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-07-09 15:59:21 +01:00
adamsong
71bb12f09e Refactor cryo item storage (#14704) 2022-07-09 15:26:45 +01:00
Redmoogle
0c801129d1 Makes Radiation Storm Event more dangerous (#14658)
* Make Radiation storms way more spicy

* 25 Seconds
2022-07-09 14:05:22 +01:00
Bop
39bf78b831 [PORT] Metallic hydrogen armor and helmet from tg (#14619)
* Add atmos armor and helmet

* buffed a bit

* Fixes??

* Added item icons

* Makes so that you can upgrade normal helmet and armor to metallic hydrogen

* Reduce spessmen speed when wearing metal hydrogen armor

* Changes some shit

* Added bounty for atmos helmet and armor

* changes

* e

* A

* g

* Att

* This should do

* Last commit

* i was kidding this is last

* Revert "i was kidding this is last"

This reverts commit db4359a99f.

* I swear this is last

* i swear this is my last commit

* maybe too much

* Changes some texts

* Balacnes hydrogen armor and helmet

* Turns atmos armor and helmet to normal state, Makes new atmos hardsuit with capable of protecting user from rad, fire, pressure with slowdown of 0.33(same as riot suit)

* fixes

* meh

* Req more hydrogen to make hardsuit

* Makes more requirement for Hydrogen atmos hardsuit

* Fixes

* Maybe not the great idea

* .
2022-07-09 13:42:02 +01:00
Byemoh
8525a40b6b Mining Rework 1.9999: Kills turf based mining generation and replaces it with Cellular Automata cave generation (#14528)
* Update config.txt

* ok

* Update Lavaland.dmm

* Update LavalandGenerator.dm

* help

* fuck you

* yep

* fuck these turfs

* yeah

* Update rust_g.dll

* Update dependencies.sh

* Update dependencies.sh

* thank you merger

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-07-09 13:12:58 +01:00
Byemoh
f8b133bea2 yeah (#14706) 2022-07-08 17:48:49 -04:00
Jamie D
ab72714630 Update generic_negative_events.dm (#14715) 2022-07-06 18:14:03 +01:00
AlvCyktor
006fcbabb1 adds a sound when cooking finishes (#14580) 2022-06-26 14:52:54 +01:00
Mqiib
5d7148659d Krav Maga Nerfs (#14541)
* Krav Maga Nerfs

* capital K

* Update code/datums/martial/krav_maga.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-26 14:13:39 +01:00
Mqiib
e872d4bb0e Stunn't (#14540) 2022-06-26 13:59:28 +01:00
Redmoogle
fefc63460b Adds Brain Damage Quirk (#14497)
* Life changing shuttle ride

* bump point value

* 2nd person

* Bumps value to -7 because uncurable trauma that could be ultra shitty
2022-06-21 22:49:35 +01:00
Vaelophis Nyx
260b3f85a2 nerf DU slugs, but make them cheaper (#14473)
* nerf DU slugs, but make them cheaper

2 less uranium sheets each, AP under 100 but still absurdly high, lower damage to go with them being slightly less expensive

* bump damage back up a little

* tweak values on cost and damage

* Update shotgun.dm
2022-06-21 22:33:18 +01:00
SuperSlayer
c264ea025d Ports "Give mood buff for defibbing someone" (#14423)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update generic_positive_events.dm

* Update defib.dm

* Update human.dm

* Update objects.dm

* Update meat.dm

* Update computer.dm
2022-06-18 09:20:54 -04: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
TheGamerdk
e403ee6a16 Update mood.dm (#14375) 2022-06-11 15:45: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
c05cb71730 Mining Rework 1.5 - Okay now lets blow things up! (#14173)
* moves stuff + upgrade parts

* yes

* Update world_anvil.dm

* removes world anvil

* world anvil

* simplifies world anvil code

* Update world_anvil.dm

* blasma shotgun

* bruv

* Update layout.dm

* Update machine_vending.dm

* Update machine_vending.dm

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update upgrades.dm

* Apply suggestions from code review

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

* Update miningbase.dmm

* whoops

* Update upgrades.dm

* Update world_anvil.dm

* Update world_anvil.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-06-11 13:50:12 +01:00
Chubbygummibear
2922c6c66f implant in your guts (#14312) 2022-06-06 12:30:15 -04:00
Bluedazzled
2413e9f691 Ports Motorized Wheelchairs (#14210)
* ඞ

* suggestions applied

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

* i love suggestions

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

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-06-06 17:54:41 +02:00
Chubbygummibear
4cf04e9dad Ports TG's eye contact: social anxiety harder, get caught staring at your obsession target, and new quirk Shifty Eyes (#14258)
* eyeeyeseyes

* updated
2022-06-04 16:05:57 +01:00
Chubbygummibear
baecbab71c Ports TG's Limbgrower refactor, design expansion, and TGUI update. With added Yog feature (#14220)
* limbed

* research cost reduction

* tech node

* capitalize

* more caps

* smorphed

* roundstart feet for mqiib
2022-06-02 12:47:33 +01:00
cuackles
f541289656 new makeshift weapon, removed makeshift laser rifle (#14081)
* Update projectile.dmi

* Update launchers.dm

* hehehe

* bolts and stuff

* adds the fancy

* Update launchers.dm

* yea

* Update rocket.dm

* ssssssssss

* stuff

* Update launchers.dm

* aaaaaaaaaaaaa

* Update rocket.dm

* mhm

* begone

* Update rocket.dm

* Update ammo.dmi

* aaaaaaaaaaaaaaamhm
2022-06-02 12:21:55 +01:00
adamsong
48a2ee1b5c [s] Fix server_hop not requiring the comms key (#14284) 2022-05-31 00:32:59 +00:00
tattax
c278cf30cf moves atom/target in do_after() forward (#14161)
* wowzers

* s2

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

* s3

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-05-30 21:25:59 +01:00
ynot01
a94aa9a6f4 round actually ends on narsie & time defines (#14207)
* round actually ends on narsie

* time defines

* time defines
2022-05-28 22:56:57 +01:00
tattax
d471328b46 mice // rats fixes and additions (#14256)
* mous

* not needed
2022-05-28 17:24:59 +01:00
Theos
7ee4944fed removes miming drill mining ruin for being free syndicate gear for miners (#14225) 2022-05-28 16:59:04 +01:00
GoreDem
2f751ffc89 Update teleport.dm (#14250) 2022-05-26 11:35:06 +00:00
Chubbygummibear
29578f88f7 GLOWIFICATION (#14200) 2022-05-22 21:44:07 +01:00
UselessTheremin
6e9281c7a2 Update body.dm (#14193) 2022-05-21 15:04:21 +01:00
SuperSlayer
ad458c28ff [READY]Plague rat (#13968)
* Le Ratto

* Description

* Update plague.dm

* Update plague.dm

* Update plague_rat.dm

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

Co-authored-by: Ashleigh Carr <ashcorr20@gmail.com>

* Comments and plague meat

* Update code/datums/diseases/plague.dm

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

* Update code/datums/diseases/plague.dm

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

* Update code/datums/diseases/plague.dm

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

* Update code/modules/food_and_drinks/food/snacks/meat.dm

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

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

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

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

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

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

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

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

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

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

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

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

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

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

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

* No more infecting people with space suits and armor

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

* Update plague_rat.dm

Co-authored-by: Ashleigh Carr <ashcorr20@gmail.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-05-21 12:42:37 +01:00
Manatee
819e9d22db Depleted Uranium Recipe fix (#14159)
* haha oops

* Fixes the fact i am dumb and stupid
2022-05-17 16:32:27 -05:00
Manatee
f1fa921f15 Adds two new ammo types, and crafting recipes (#14097)
* Changes "APC Module" to "Power Control Module" for consitency

* fixes a fuckup

* Adds two new ammo types, and crafting recepies

* Makes the round hit mechs and penetrate people (probably)

* Gives each shell its own sprite, adds a sprite for a fired u shell.

* Removes incorrect documentation

* Fixes the one pixel that was there for some reason

* idk does something but it doesnt work still so idk.

* New sprite from orca

* Makes the penetration actually work. Thanks Bibby

* makes the ammo not op as fuck like when i was testing

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

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

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

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

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

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

* Avnil used the wrong slash like an IDIOT

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

i cant spell

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

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

removes a single space.

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

* Fixes my own merge conflict

* Revert "Fixes my own merge conflict"

This reverts commit 710ec071f6.

* hopefully fixes merge conflits

* Update ammo.dmi

Co-authored-by: Manatee <74586965+Ptohms@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-05-16 21:50:11 +01:00
TheGamerdk
ef5bd13cc9 [READY][AI] Reworks AI CPU + RAM. Turns the Sig Tech into the Network Admin. Adds overclocking (#13686)
* z-level restrictions

* Initial card rewrite

* UI Mockup

* e

* Functionality almost working

* test map

* pre-rename

* Network Admin Complete

* tiny tiny workshop

* tiny tiny tiny tiny workshop try 2

* makes tgui compile

* map files duh

* gax

* Update engineering.dm

* stuff should cost points

* ew

* Update rack_creator.dm

* attackby

* Update AiRackCreator.js

* Update rack.dm

* Update network_admin.dm

* Update network_admin.dm

* Update cpu.dm

* access and spelling stuff

* Unique imprinter

* maps

* netmin

* oops

* Fractional CPU and search for projects

* AI research points

* Assorted bug fixes

* Research booster upgrade

* netmin

* Examine

* overclocking

* Fractional CPU + Overclocking finished

* Rack upgrades + TGUI linter

* Yogstation

* access

* propers yogstation

* Meta + yogs fix

* kilo

* GAX

* oops

* Update overclocking.dm

* Update resource_distribution.dm

* spaces

* Update AiOverclocking.js

* Update induction.dm

* Update rack_creator.dm

* assorted bugfixes

* Core tracking

* Update AiServerConsole.js

* Update AiDashboard.js

* Update AiDashboard.js
2022-05-16 21:40:38 +01:00
Theos
7dbf1e71a7 Buffs advanced stack healing items (#14142)
* Update slash.dm

* Update pierce.dm

* Update medical.dm

* Update medical.dm

* sutures get +5 item in stack
2022-05-16 21:16:27 +01:00