Commit Graph

12033 Commits

Author SHA1 Message Date
deathride58
225d435efd Merge pull request #8015 from Trilbyspaceclone/patch-62
Adds A Valentine Crate And Candy Crate
2019-02-20 20:18:42 -05:00
deathride58
81c9c5078f Merge pull request #8013 from Citadel-Station-13/kevinz000-patch-24
fixes admin permission R_EVERYTHING
2019-02-20 20:18:04 -05:00
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
BlackMajor
1ff058ac50 Whoops 2019-02-20 21:27:31 +13: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
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
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
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
Ghom
d1d22d9d24 > (#7983) 2019-02-08 05:29:04 -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
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
NopemanMcHalt
78dca7552e Adds two crusader variants for chaplain (#7979)
* More crusader armor variants to pick from

Not modularized.

* Makes armor name generic/same with exception of horned and winged helmets

* goddamn it fucking hell what the shit AAAAAAAA

New crusader armor is now digitigrade compatible, also fixes digitigrade templar armor.
2019-02-05 18:15:12 -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
1eff3dcdb5 [Ready] Gives large compressed matter its own name and desc, Also ports Tg #41256 (#7953)
* Update RCD.dm

* Ports Tg#41256

* .
2019-02-05 18:11:18 -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
fa34212e60 [Ready] Fixes mute trait (#7959)
* Fuck it lets not have the trait broken

* Update negative.dm

* Update negative.dm

* Update negative.dm
2019-01-27 00:35:16 -08:00
Trilbyspaceclone
b8043dc807 [Ready] Buffs Cayenne the carp (#7956)
* buffs Cayenne the carp

* woops >_<
2019-01-27 00:34:56 -08:00
Trilbyspaceclone
14b873c9aa [Ready] Fixes power tool drill fitting in boots/wallet (#7958)
* Update wallets.dm

* Makes sure boots cant do it
2019-01-27 00:34:36 -08:00
deathride58
5b43a2dba3 Janitor powercreep - buffs mops by axing the delay on their cleaning (#7954)
* janitor powercreep - heavily buffs mops

* nerfs mops by making them use up stamina. standard mop takes 5 stamina per tile mopped, advanced mop takes 2 stamina

* fixes travis
2019-01-27 00:32:50 -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
kevinz000
67d9dd4a82 Update effect_system.dm 2019-01-27 00:09:24 -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
nik707
b7ab4a5bb6 Merge pull request #7963 from kiwedespars/master
adds bwoinking and snapping to vog.
2019-01-26 23:45:21 -06:00
deathride58
a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff
Adds a Lamp Plushie
2019-01-26 00:05:21 -05:00
Cydia
c860a797fd Adds a Lamp Plushie
Little lamp plushie, click clack.
2019-01-24 22:28:28 -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