cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-15 04:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

212 Commits

Author SHA1 Message Date
Trilbyspaceclone
1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone
e61b4f83d8 Update large_objects.dm 2019-04-20 00:37:45 -04:00
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad 
Addtion ways to deal with radiation
 2019-04-06 19:14:46 -07:00
Trilbyspaceclone
3e023df8be Update packs.dm 2019-04-04 16:09:45 -04:00
Trilbyspaceclone
899985f22e Update packs.dm 2019-04-04 15:35:49 -04:00
Trilbyspaceclone
0504f2e02a Update packs.dm 2019-03-24 10:34:35 -04:00
Trilbyspaceclone
bf1c8a5e7d LOCAL CAT CANT DO ANYTHING CORRECT 2019-03-20 21:09:40 -04:00
Trilbyspaceclone
978b5261ce Update packs.dm 2019-03-20 20:54:34 -04:00
Trilbyspaceclone
9d15665cbb Update packs.dm 2019-03-20 17:12:05 -04:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto 
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
 2019-03-10 13:44:57 -07:00
Trilbyspaceclone
8b99ca8094 Update packs.dm 2019-03-09 20:31:00 -05:00
Trilbyspaceclone
beb812e291 Update packs.dm 2019-03-09 20:03:40 -05:00
Trilbyspaceclone
1995f2d61d [Ready] More cargo bounties. (#7955) 
* Fixing updater

* Update medical.dm

* Update medical.dm

* ?

* Update engineering.dm

* Update science.dm

* Update security.dm

* Update mining.dm

* Forgot this

* Apply suggestions from code review

Killing rag with grammar

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

* Apply suggestions from code review

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

* Update science.dm

* Kev requestions

* Fixed?

* even more sec things

* Makes bluespace crystals say the kind they want

* Fixed? And more medical boundys

* Update medical.dm

* Blood fixed?

* Update medical.dm

* Poojawa the saver

* Poojawa the hero

* Update medical.dm
 2019-02-22 05:51:01 -08:00
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
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
Tupinambis
0f271498d1 Makes plushies less common. (#7981) 2019-02-13 20:47:09 -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
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
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
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
Trilbyspaceclone
da7dbe6204 Update packs.dm 2019-01-20 17:34:15 -05:00
Ragolution
6ba56c7331 Apply suggestions from code reviewer Rag 
Spell checker

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-12 15:06:38 -05:00
deathride58
52c1e483f5 Merge pull request #7901 from Trilbyspaceclone/patch-43 
[Ready] Moves RCLD to a proper place - Requested by Kevs
 2019-01-12 01:13:04 -05:00
Trilbyspaceclone
1e425c7e40 Update packs.dm 2019-01-11 18:17:47 -05:00
Trilbyspaceclone
165967416e Update manifest.dm 2019-01-11 18:07:39 -05:00
Trilbyspaceclone
9a6d395197 Update order.dm 2019-01-11 18:06:12 -05:00
Trilbyspaceclone
2a0a57dcd2 Update manifest.dm 2019-01-11 17:56:57 -05:00
Trilbyspaceclone
ae8b026cf2 Update packs.dm 2019-01-08 15:17:02 -05:00
Trilbyspaceclone
c96b6dfee8 [Ready] Hunting, Anitviro and Russian gear crate! (#7796) 
* Cargo

* grammar

* Update packs.dm

* reduce anitviro crate cost

* No fun allowed

* Update packs.dm
 2019-01-08 02:35:41 -08:00
Trilbyspaceclone
3ae46ba2da Moves RCLD to a proper place 2019-01-06 04:27:06 -05:00
Trilbyspaceclone
cbae32f82d [Ready] Cargo packets with RLD RCD and IRCD! (#7840) 
* *oh no*

* I know I know

* Update packs.dm

* Last touches

* "Not that op"

* Update packs.dm

* makes the IRCD

* Update packs.dm
 2018-12-31 03:07:20 -08:00
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
 2018-12-10 16:45:38 -06:00
Trilbyspaceclone
3e736dcdf2 adds in white crayons 2018-12-08 17:19:13 -05:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
Trilbyspaceclone
17b5a6061a Cargo Hardsuit Packets as well as a pare of soft suits (DPO) (#7767) 
* Hardsuits and a set of softs

* Ups sec suit to 3000 do to it being a sec suit

* DropPodOnly!

* Woops

* Kev wishes
 2018-12-04 18:14:04 -08:00
nik707
036757488d Merge pull request #7783 from R3dtail/new_carpet 
Added a new carpet
 2018-12-02 21:52:03 -06:00
Redtail
e339bcd2ca Added a new carpet 
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
 2018-12-01 20:21:18 -06:00
Trilbyspaceclone
810f7f186d Headset sorrow 2018-11-20 19:37:13 -05:00
Trilbyspaceclone
66b5f06514 Grammar 2018-11-20 16:39:01 -05:00
Trilbyspaceclone
508f25c14d aye 2018-11-18 20:19:28 -05:00
Trilbyspaceclone
e3bd357a1a Less cargo blote 2018-11-10 00:32:46 -05:00
Trilbyspaceclone
8dd2dbef61 Better? 2018-11-10 00:23:48 -05:00
Trilbyspaceclone
c3b0a1d943 Removes the bloat 2018-11-08 19:18:36 -05:00
Trilbyspaceclone
edcbad3ecb Adds in kitty ears and fixs a misstake 2018-11-03 22:14:36 -04:00
Trilbyspaceclone
31cbb5caa8 Adds in Knifes and fixes Lewd crates 2018-11-03 22:08:58 -04:00
Trilbyspaceclone
98b714ab40 Lewd stuffs 
`Oh no`
 2018-11-03 21:51:18 -04:00
Trilbyspaceclone
7e333b5aa7 Many goodies 2018-11-03 21:22:44 -04:00