Commit Graph
912 Commits
Author SHA1 Message Date
kevinz000andGitHub 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
kevinz000andGitHub 6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
2019-10-08 00:30:54 -07:00
kevinz000andGitHub 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
Ghommie 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Poojawa 6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa 27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05:00
kevinz000andGitHub 1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
TrilbySpaceClone 3f893195bf tested! 2019-09-30 11:42:07 -04:00
FermiandFermi 3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
FermiandFermi 146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707andGitHub 3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
TrilbySpaceClone 41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
FermiandFermi 00a46fe971 Missed a beaker 2019-09-22 03:03:33 +01:00
FermiandFermi f301a85cdd Bucket lip 2019-09-22 02:59:08 +01:00
FermiandFermi a48c881a8c Sprites. 2019-09-22 02:58:23 +01:00
FermiandFermi 0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Ghommie 293d0f02c9 Fixes clown shoes icon_state. 2019-09-21 22:06:40 +02:00
TrilbySpaceClone 45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
kevinz000andGitHub 5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000andGitHub f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
kevinz000andGitHub 9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
TrilbySpaceClone 5ecf68918b tada 2019-09-18 03:47:52 -04:00
TrilbyspacecloneandGitHub 5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
TrilbySpaceClone fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
TrilbySpaceClone 17f6304acf hm 2019-09-11 06:54:50 -04:00
kevinz000andGitHub ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2019-09-10 22:06:36 -07:00
TrilbySpaceClone 0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
kevinz000andGitHub e793c1abcb Delete plushes (2).dmi 2019-09-07 17:15:27 -07:00
kevinz000andGitHub 0abef923b4 Add files via upload 2019-09-07 17:14:47 -07:00
kevinz000andGitHub cfdbb54245 Add files via upload 2019-09-07 17:13:59 -07:00
kevinz000andGitHub cd4403911b Delete plushes.dmi 2019-09-07 17:03:27 -07:00
TrilbySpaceClone 4170da3a2e missed sleepers 2019-09-07 04:28:39 -04:00
TrilbySpaceClone a91eb608cd All of the objects 2019-09-06 13:56:10 -04:00
TrilbySpaceClone c663e7d324 smaller and bigger 2019-09-04 14:21:25 -04:00
TrilbySpaceClone fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -04:00
TrilbySpaceClone 74fc240f0e weh 2019-09-03 11:13:11 -04:00
nik707andGitHub 2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
TrilbySpaceClone 58458a6740 the seeds 2019-08-31 21:12:27 -04:00
TrilbySpaceClone 4d16abc141 Merge branch 'master' into fruit 2019-08-31 21:11:22 -04:00
TrilbySpaceClone c2f189bbdb Merge branch 'master' into fruit 2019-08-31 21:09:59 -04:00
TrilbySpaceClone 98c268d6ac fix 2019-08-31 16:58:03 -04:00
TrilbySpaceClone 36695d556f Lets have all the ammo and kegs together 2019-08-31 15:38:26 -04:00
nik707andGitHub c826e1b412 Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
lolman360andGitHub c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00
lolman360andGitHub 15cfcfc8c3 ffffffff 2019-08-31 10:09:37 +10:00
lolman360andGitHub 689ba1246b eeeeee eeeeeee eeeeeeeeeeee 2019-08-31 10:08:31 +10:00
TrilbySpaceClone 96aae12057 readds 2019-08-29 21:19:16 -04:00
TrilbySpaceClone ea7235d089 Merge branch 'master' into fruit 2019-08-29 21:15:18 -04:00
nik707andGitHub 2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
2019-08-29 19:59:37 -05:00