Commit Graph

7573 Commits

Author SHA1 Message Date
BlackMajor 10244cd3b1 Plushtide 2
More plushies, /random plush spawner.
Some more dumb sounds.
2019-02-20 01:36:38 +13:00
Fermi 2308913205 Replaced mutagen in reaction with stable_plasma
Why does it take issue with indents every time?

Byond is very confusing.

Don't worry I made sure it compiles.
2019-02-18 23:24:37 +00:00
Fermi 38e4532c5c Changed reaction to be 10 sugar, 10 blood and 10 unstable mutagen
Everyone who works the codebase is a delightful person.

I'm serious!!
2019-02-18 23:10:33 +00:00
Fermi 516a2df48e Replaced reactionwith 10 sugar + 10 blood @ 400K
This is all terribly spooky.
2019-02-18 23:06:31 +00:00
Fermi 9dac564412 Quick fix to reduce the amount of FermiPlushies spawned
Fun!!
2019-02-18 22:42:07 +00:00
Fermi ad28d80ecb Fermichem test: Fermiplushie added plus reaction to create
A quick test of the chemistry system to create new reactions. Added FermisPlushie, which is created by reaction (I hope!)
2019-02-18 22:30:59 +00:00
Trilbyspaceclone 66f1a572ea Update packs.dm 2019-02-17 22:00:41 -05:00
Trilbyspaceclone 5ca088202d Update packs.dm 2019-02-17 21:25:40 -05:00
kevinz000 c9afcde51c Update brain_item.dm 2019-02-16 17:16:25 -08:00
kevinz000 eead9b6eaa viola donator hairstyle 2019-02-15 08:24:31 -08:00
Trilbyspaceclone 8554187075 Update other.dm 2019-02-14 21:02:55 -05:00
Trilbyspaceclone 81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone 3aee62eeb7 Update accessories.dm 2019-02-14 20:22:13 -05:00
Trilbyspaceclone e8e67cc903 Update other.dm 2019-02-14 19:55:15 -05:00
Trilbyspaceclone c9c185b3e1 2 out of 5 2019-02-14 19:12:10 -05:00
Trilbyspaceclone 4e68eebe2a Grammar isnt a thing cats do 2019-02-14 19:09:57 -05:00
Trilbyspaceclone 0379bd2b89 grammar what is that? 2019-02-14 17:10:45 -05:00
Trilbyspaceclone e1dc0ef51b Update uplink_items.dm 2019-02-14 17:03:42 -05:00
deathride58 7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
deathride58 40d9dee654 gives combat mode examine text and a message on activation (#7995) 2019-02-13 21:01:12 -08:00
deathride58 2c705a7ba4 QOL for pickpocketing - Stripping items off of someone will now place them in your hands if possible (#7994) 2019-02-13 20:59:51 -08:00
Coolgat3 f7b1304d57 Fixes clockcult to be actually playable on citadel. (#7982)
* Some fixes

* Buffed vanguard to grant infinite stamina to actually make you immune to stuns

* Fixed the comment to not say infinite stun immunity cause that looked scary and bugged me lmao

* Revert "Buffed vanguard, infinite stam"

This reverts commit 8290e5bc4050f7c6476cde3dafb327bf93d49ef3 and
105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Revert "Buffed vanguard to grant infinite stamina to actually make you immune to stuns"

This reverts commit 105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Fixed vanguard and trying to fix reebe getting the reebe ztrait

* Git is hard. Fix.

* Vanguard buffs

* Git ate the credits
2019-02-13 20:47:57 -08:00
Tupinambis 0f271498d1 Makes plushies less common. (#7981) 2019-02-13 20:47:09 -08:00
Trilbyspaceclone 7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974)
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
2019-02-13 20:46:55 -08:00
MediHound f8f482bc69 Changes to Borg upgrades and modules
Disabler Cooler now works for Security and K9, added Crew Pinpointer to Security and MediHound, added Crew Monitor to Medical.
2019-02-11 16:51:36 +01:00
kevinz000 a56793d6c0 Update snacks_meat.dm 2019-02-08 05:27:51 -08:00
Trilbyspaceclone ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08:00
Trilbyspaceclone ba26c374cb [Ready] Janitor buff, they can now get a spray bottle of drying agent (#7960)
* Update spray.dm

* Update packs.dm

* Update wardrobes.dm

* >Works with cargo and lists all the time yet still forgets the comma

* Update wardrobes.dm

* Update packs.dm
2019-02-08 05:25:07 -08:00
kevinz000 49653babab Update snacks_meat.dm 2019-02-08 04:28:07 -08:00
MediHound 737c0c7700 Update ion_storm.dm (#7980)
* Update ion_storm.dm

* Update ion_storm.dm
2019-02-08 02:13:14 -08:00
Zargul 4574627250 Low plasma concentration does not damage anymore (#7977)
* Update lungs.dm

* Update lungs.dm

* Update lungs.dm
2019-02-08 02:11:02 -08:00
deathride58 7b00195c0c reduces stamloss for shotgun pumping from 5 to 2 (#7973) 2019-02-05 18:15:31 -08:00
Trilbyspaceclone cf4c5bc7e5 Update snacks_other.dm (#7971) 2019-02-05 18:14:23 -08:00
Trilbyspaceclone 660703e713 [Ready] Fixes price of Paperwork and makes the not have 2 spare pens (#7969)
* Update manifest.dm

* Blacklists

* Removes cardboard

* Forgot the comma

* : /
2019-02-05 18:13:26 -08:00
Trilbyspaceclone b27ab885f3 [Ready] Adds new huds that help correct vision. (#7943)
* Fixing updater

* Adds the things

* Update all_nodes.dm

* Update misc_designs.dm

* Update hud.dm

* Update engine_goggles.dm

* Update _glasses.dm

* Update hud.dm

* Update packs.dm

* Update misc_designs.dm

* Update packs.dm

* Update hud.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update hud.dm

* Update misc_designs.dm
2019-02-05 18:09:34 -08:00
Ghom 0449325212 Fixes invisible limb sprites. (#7951)
* F

* FF

* FFF
2019-02-05 18:05:34 -08:00
Poojawa eb623ebdd6 Pretty late join menu memes (#7978)
* initial things, need to clean up bhjin snowflake

* idk how to fix it

Links work, but it doesn't play nice with the loop.

* Update new_player.dm

don't actually need job_count, tbh I think

* working as intended

* deletes brazil
2019-02-05 17:57:26 -08:00
Tupinambis e5e97302d4 Adds a new security level: Amber (#7976)
* Adds the Amber security level.

* This isn't C
2019-02-05 17:53:58 -08:00
BlackMajor eb0d9ba63b Adds the plushtide. (#7972)
* Plushtide is now

Adds plushies, puts them in arcades and cargo crates. Adjusts cargo crate cost to 1500.

* Small adjustments

Sounds were too quiet, robot misnamed

* Small typo fix

scruppuppy -> scrubpuppy
2019-02-04 00:28:47 -08:00
Trilbyspaceclone dab1591bca Update drinks_recipes.dm (#7962) 2019-01-27 00:35:43 -08:00
Trilbyspaceclone b8043dc807 [Ready] Buffs Cayenne the carp (#7956)
* buffs Cayenne the carp

* woops >_<
2019-01-27 00:34:56 -08:00
deathride58 31af02d4e6 makes flashes more effective as a utility item rather than a weapon (#7911) 2019-01-27 00:32:40 -08:00
deathride58 fa1693a291 adds the player's character name to the new player panel so that people quit joining in as the wrong character (#7908) 2019-01-27 00:32:13 -08:00
nik707 55b622c148 Merge pull request #7961 from Citadel-Station-13/kevinz000-patch-5
tgs3 sdql2 command is slightly more useful but still pretty damn useless
2019-01-26 23:45:46 -06:00
kiwedespars a876e985e7 adds bwoink and snap to vog
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
2019-01-24 18:41:42 -08:00
kevinz000 beab8047b9 Update chat_commands.dm 2019-01-23 23:59:07 -08:00
deathride58 b9d5beeefd Merge pull request #7932 from Trilbyspaceclone/racec
[Ready] Adds the abilty to make 3 lesser race tonics
2019-01-21 19:47:48 -05:00
deathride58 6719cf4b52 Merge pull request #7924 from Trilbyspaceclone/paperwork
[Ready] Makes paper work for cargo to do for spare credits!
2019-01-21 19:46:58 -05:00
deathride58 2cd500de04 Merge pull request #7925 from Citadel-Station-13/kevinz000-patch-15
Radioactive Teleport Armor - Everyone Dies Edition
2019-01-21 19:45:51 -05:00
Trilbyspaceclone da7dbe6204 Update packs.dm 2019-01-20 17:34:15 -05:00