5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04:00
fa868ce4ff
fashen crime
2019-09-11 14:22:50 -04:00
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
e793c1abcb
Delete plushes (2).dmi
2019-09-07 17:15:27 -07:00
0abef923b4
Add files via upload
2019-09-07 17:14:47 -07:00
cfdbb54245
Add files via upload
2019-09-07 17:13:59 -07:00
cd4403911b
Delete plushes.dmi
2019-09-07 17:03:27 -07:00
4170da3a2e
missed sleepers
2019-09-07 04:28:39 -04:00
a91eb608cd
All of the objects
2019-09-06 13:56:10 -04:00
2fe5571887
Merge pull request #9212 from dapnee/plasmaglass-tables-spears
...
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
58458a6740
the seeds
2019-08-31 21:12:27 -04:00
4d16abc141
Merge branch 'master' into fruit
2019-08-31 21:11:22 -04:00
c2f189bbdb
Merge branch 'master' into fruit
2019-08-31 21:09:59 -04:00
98c268d6ac
fix
2019-08-31 16:58:03 -04:00
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
c20bcccee8
gggggggggggggggggggggggg
2019-08-31 10:11:47 +10:00
15cfcfc8c3
ffffffff
2019-08-31 10:09:37 +10:00
689ba1246b
eeeeee eeeeeee eeeeeeeeeeee
2019-08-31 10:08:31 +10:00
96aae12057
readds
2019-08-29 21:19:16 -04:00
ea7235d089
Merge branch 'master' into fruit
2019-08-29 21:15:18 -04:00
2307f7a2a6
Merge pull request #9146 from Raptorizer/Botany-Peaches
...
New plant type: Peaches
2019-08-29 19:59:37 -05:00
4e9077aa2d
aaaaaaa
2019-08-29 19:34:14 -05:00
48f6b9408a
Cotton/Durathread added?
2019-08-29 19:31:11 -05:00
daf2ce5182
HHHHHH
2019-08-29 19:29:01 -05:00
a83f4f96bb
Update seeds.dmi
2019-08-29 19:27:49 -05:00
54cee2ff87
Conflict Resolve
...
Updated to include cotton/durathread
2019-08-29 19:26:46 -05:00
d2bb75c820
Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered
...
Toricrates: Remastered: Complete Edition 2019
2019-08-29 18:56:51 -05:00
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
67efddcd8f
coding makes me want to hang myself with cat 5e
2019-08-27 10:35:46 +10:00
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
05a8c3bb20
aaaaaaa
2019-08-23 14:47:19 -04:00
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
a80dfada21
[WIP] Plasmaglass Tables!
...
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.
## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.
## Changelog
🆑
add: Plasmaglass tables
/🆑
2019-08-23 12:38:07 -06:00
5be9f3fc01
pice 2 names
2019-08-22 14:24:00 +10:00
5df9ea3578
pice
2019-08-22 14:18:15 +10:00
fc2fdf71ca
Merge pull request #9164 from lolman360/sprites
...
lolman fucks up his first pr
2019-08-21 11:17:39 -04:00
c586ef56bc
SLEEP BAD
2019-08-20 10:15:20 +10:00
846d70fe27
eeeeeeeeeeee
2019-08-20 09:48:58 +10:00
5f00cc61b8
GMER
2019-08-20 09:46:03 +10:00
f78fc3ea65
AAAAAAAAAAAAAAAAAAAAAAA
2019-08-20 09:15:10 +10:00
7a8e2c3f50
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
2019-08-19 17:54:16 -04:00
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
c10c78eb27
readds cotten sprites
2019-08-19 07:56:20 -04:00
6c6391b4c4
Merge branch 'master' into fruit
2019-08-19 07:37:12 -04:00
47dd8d22eb
Merge pull request #9149 from Trilbyspaceclone/padding_and_such
...
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
2019-08-18 23:37:56 -07:00
e69d27f9eb
Traitor armor
2019-08-17 20:36:47 -04:00
ff58fec243
New plant type: Peaches
...
Botanists can now grow peaches from a new pack of seeds!
2019-08-17 02:50:56 -05:00
372c53b3da
Uploads new drinks.dmi
...
Adds Commander and Chif
2019-08-17 01:47:25 -04:00
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
dace39137f
Kenneth!!
2019-08-17 11:54:55 +10:00
Trilbyspaceclone