Commit Graph

1522 Commits

Author SHA1 Message Date
deathride58
d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74
[Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn
2019-03-08 20:54:21 -05:00
Trilbyspaceclone
bda18c0770 Update extinguisher.dm 2019-03-06 20:32:40 -05:00
Trilbyspaceclone
7c79484784 Update extinguisher.dm 2019-03-06 20:05:53 -05:00
Trilbyspaceclone
fdad1c30be ? 2019-03-06 17:05:54 -05:00
Trilbyspaceclone
371a4a1a9e Maybe 2019-03-06 16:45:47 -05:00
Trilbyspaceclone
8a5b4414a3 Update extinguisher.dm 2019-03-05 16:37:22 -05:00
Trilbyspaceclone
1228bb4b11 Update extinguisher.dm 2019-03-05 15:37:27 -05:00
Trilbyspaceclone
a0b38d0ed7 Update extinguisher.dm 2019-03-05 03:34:38 -05:00
Trilbyspaceclone
8f02bf0357 Oh I did a goof 2019-03-05 00:33:53 -05:00
Trilbyspaceclone
eb80b6f6cd ? 2019-03-05 00:29:20 -05:00
Trilbyspaceclone
c6011bb853 Update extinguisher.dm 2019-03-04 23:35:25 -05:00
Trilbyspaceclone
5f764b7d1b Update candle.dm 2019-03-04 20:33:53 -05:00
kevinz000
21d6412104 Merge pull request #8050 from TrojanCoyote/master
Adding a plush
2019-03-01 02:24:38 -08:00
Nope
15bd91ecd9 Update plushes.dm 2019-02-27 18:22:25 -06:00
kevinz000
bdffc9e10c Merge pull request #8003 from Trilbyspaceclone/morefamstuff
More heirloom stuff for Lawyer, Cap and Chap
2019-02-27 16:18:25 -08:00
Nope
aaeedd1ffa Adding a plush
burgit fuckin add this reeeeeee /obtuse/
2019-02-26 18:55:08 -06:00
deathride58
e74f5bad3f Merge pull request #8020 from Citadel-Station-13/kevinz000-patch-27
[s] grenade logging improvement
2019-02-22 13:04:03 -05:00
kevinz000
0d43cac0e6 Update grenade.dm 2019-02-22 06:02:55 -08:00
nik707
788b97def5 Merge pull request #8019 from Thalpy/FermiChem
Fermi chem creates a plushie
2019-02-22 02:41:42 -06: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
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
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
81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone
4223b4888b Yay 2019-02-14 19:38:56 -05:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -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
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
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
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
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
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
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
kevinz000
651741f6f9 Update toolbox.dm 2019-01-15 19:56:47 -08:00
nik707
aaa3b02b25 Merge pull request #7920 from deathride58/noisyflashlights
noisy flashlights - makes flashlights play a sound when toggled
2019-01-14 22:21:21 -06:00
deathride58
a8ecd768dd Merge pull request #7900 from Citadel-Station-13/kevinz000-patch-16
Buffs the shit out of the RLD (4x material, view --> range)
2019-01-12 01:11:18 -05:00
deathride58
0dc641f962 noisy flashlights - makes flashlights play a small sound when toggled on/off 2019-01-11 03:08:10 -05:00
Ragolution
821c6f9db5 Found another one.
TRILBYYYYYYYY
2019-01-10 08:51:06 -05:00
Trilbyspaceclone
2e0e115b24 Adds 6 new colors to the unlimited paint chaining can (#7903)
* Update paint.dm

* I did this by hand and not Copy pasted, go me
2019-01-08 02:28:05 -08:00
kevinz000
a5ba768918 Update RCD.dm 2019-01-06 01:51:47 -08:00
kevinz000
9824bdb480 Update RCD.dm 2019-01-06 01:26:59 -08:00