Commit Graph
1489 Commits
Author SHA1 Message Date
Ghommie 293d0f02c9 Fixes clown shoes icon_state. 2019-09-21 22:06:40 +02: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 5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94
Fixes clown shoes and work boots.
2019-09-21 01:42:03 -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
Ghommie 300c572886 Added work boots and bananium clown shoes inhands, more fixes. ready. 2019-09-15 18:21:48 +02:00
Poojawa bf3d30c0e4 Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa 0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
TrilbyspacecloneandGitHub 5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa 9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
TrilbySpaceClone fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
kevinz000andGitHub f4bff19592 Merge pull request #9260 from dapnee/trim-decals
Ports trim decals
2019-09-11 03:26:47 -07: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
Dap 9f275ebf01 Ports trim decals
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06: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
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
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
Raptorizer 4e9077aa2d aaaaaaa 2019-08-29 19:34:14 -05:00
Raptorizer 48f6b9408a Cotton/Durathread added? 2019-08-29 19:31:11 -05:00
Raptorizer daf2ce5182 HHHHHH 2019-08-29 19:29:01 -05:00
Raptorizer a83f4f96bb Update seeds.dmi 2019-08-29 19:27:49 -05:00
Raptorizer 54cee2ff87 Conflict Resolve
Updated to include cotton/durathread
2019-08-29 19:26:46 -05:00
nik707andGitHub d2bb75c820 Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered
Toricrates: Remastered: Complete Edition 2019
2019-08-29 18:56:51 -05:00
Dap 7a7c810e7b Plasmaglass Tables, Spears, Shards (Take 2)
## About The Pull Request

Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. (This was more to try out messing with code/spriting.)
![](https://i.imgur.com/4vf4TSq.png)

Along with this, Nanotrasen has seen fit to outfit it's assistants with the ability to create spears with the difficult to destroy plasmaglass structures that are uncommon to find!
![](https://i.imgur.com/TRGy6r0.png)

## Why It's Good For The Game
New thing for people to make, basically a stronger table. After adding plasmaglass spears, these tables no longer break on standing on them. Also, now plasma glass shards will ACTUALLY SPAWN when breaking a plasmaglass window of any form.

## Changelog
🆑
add: Plasmaglass tables, spears, tiny plasmaglass shards
fix: Plasmaglass structures now drop plasmaglass shards instead of nothing
/🆑
2019-08-28 15:15:58 -06:00
Dap b89430ccfd Update back.dmi 2019-08-28 15:07:18 -06:00
Dap 19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
Dap 49e1350127 re-adds plasmaspears to back.dmi cause bot is mean 2019-08-28 01:34:16 -06:00
Dap 9f2e7f5b43 revert back.dmi to maybe shut up the bot 2019-08-28 01:30:58 -06:00
TrilbySpaceClone 419ea7f58c Fancy_part1 2019-08-27 12:41:47 -04:00
lolman360andGitHub 67efddcd8f coding makes me want to hang myself with cat 5e 2019-08-27 10:35:46 +10:00
Dap eca17ad435 pls 2019-08-26 13:09:18 -06:00