Commit Graph

13165 Commits

Author SHA1 Message Date
deathride58 59a982466f Merge pull request #8022 from BlackMajor/master
Plushtide 2: Electric Boogaloo
2019-02-20 19:21:34 -05:00
deathride58 e2ae4181f4 Merge pull request #7993 from MediHound/dogborg-upgrades-rework-v01
Cyborg upgrades rework v01
2019-02-20 19:19:20 -05:00
kevinz000 a67be2a57a Update _production.dm 2019-02-20 05:33:29 -08:00
deathride58 a386632c8a travis is a travesty 2019-02-20 04:04:23 -05:00
deathride58 c11aba9368 oh, right. i've gotta add a snowflake check since /living lacks bleed() in the base code 2019-02-20 03:37:07 -05:00
BlackMajor 1ff058ac50 Whoops 2019-02-20 21:27:31 +13:00
deathride58 20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
deathride58 b58502ae70 Merge pull request #8006 from Citadel-Station-13/viola_chan
Adds a modified ckey-locked hairstyle for Fractious
2019-02-19 08:14:28 -05:00
BlackMajor 10244cd3b1 Plushtide 2
More plushies, /random plush spawner.
Some more dumb sounds.
2019-02-20 01:36:38 +13:00
Fermi 2497d0e6e9 I'm blind (Fixed name)
OOPS
2019-02-19 04:31:56 +00:00
kevinz000 12eac8f625 Update grenade.dm 2019-02-18 16:39:43 -08:00
Fermi 46af2743f8 Fixed the issue with the sprite!!
Yey!
2019-02-19 00:35:22 +00:00
Fermi 1eddf1a679 Changed name to medcat as per blackmajor's wishes
I don't know how spite animations work too.
2019-02-18 23:56:00 +00:00
Fermi ea2d3000d4 Fixed grammar and pointed to correct sprite
Have a nice day.
2019-02-18 23:38:10 +00: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 42264cb671 Update admin.dm 2019-02-17 01:55:23 -08: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
nik707 efce0e144f Merge pull request #7985 from Citadel-Station-13/kevinz000-patch-20
Doubles say/emote MAX_MESSAGE_LEN
2019-02-14 20:38:37 -06:00
Trilbyspaceclone 8554187075 Update other.dm 2019-02-14 21:02:55 -05:00
Trilbyspaceclone 601c80999e Update negative.dm 2019-02-14 20:53:21 -05:00
Trilbyspaceclone 81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone bb37a9679c Update negative.dm 2019-02-14 20:35:03 -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 4223b4888b Yay 2019-02-14 19:38:56 -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
Cyprian 1a87a00893 Reverting the changes for team numbers. Lowering clock cult requirement to 20 aswell now that it won't conflict with the PR about fixes to clockcult 2019-02-14 12:24:10 +01: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
Avunia f8e7802d6f Changing player number checks 2019-02-10 14:37:30 +01:00
Ghom d1d22d9d24 > (#7983) 2019-02-08 05:29:04 -08: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 477d1151da Update say.dm 2019-02-08 05:23:51 -08:00