Commit Graph

865 Commits

Author SHA1 Message Date
kevinz000
e793c1abcb Delete plushes (2).dmi 2019-09-07 17:15:27 -07:00
kevinz000
0abef923b4 Add files via upload 2019-09-07 17:14:47 -07:00
kevinz000
cfdbb54245 Add files via upload 2019-09-07 17:13:59 -07:00
kevinz000
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
nik707
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
98c268d6ac fix 2019-08-31 16:58:03 -04:00
nik707
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
lolman360
c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00
lolman360
15cfcfc8c3 ffffffff 2019-08-31 10:09:37 +10:00
lolman360
689ba1246b eeeeee eeeeeee eeeeeeeeeeee 2019-08-31 10:08:31 +10:00
nik707
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
nik707
d2bb75c820 Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered
Toricrates: Remastered: Complete Edition 2019
2019-08-29 18:56:51 -05:00
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
lolman360
67efddcd8f coding makes me want to hang myself with cat 5e 2019-08-27 10:35:46 +10:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
Sishen
05a8c3bb20 aaaaaaa 2019-08-23 14:47:19 -04:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
Dap
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
lolman360
5be9f3fc01 pice 2 names 2019-08-22 14:24:00 +10:00
lolman360
5df9ea3578 pice 2019-08-22 14:18:15 +10:00
deathride58
fc2fdf71ca Merge pull request #9164 from lolman360/sprites
lolman fucks up his first pr
2019-08-21 11:17:39 -04:00
lolman360
c586ef56bc SLEEP BAD 2019-08-20 10:15:20 +10:00
lolman360
846d70fe27 eeeeeeeeeeee 2019-08-20 09:48:58 +10:00
lolman360
5f00cc61b8 GMER 2019-08-20 09:46:03 +10:00
lolman360
f78fc3ea65 AAAAAAAAAAAAAAAAAAAAAAA 2019-08-20 09:15:10 +10:00
Sishen
7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
kevinz000
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
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
Raptorizer
ff58fec243 New plant type: Peaches
Botanists can now grow peaches from a new pack of seeds!
2019-08-17 02:50:56 -05:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
lolman360
dace39137f Kenneth!! 2019-08-17 11:54:55 +10:00
Michiyamenotehifunana
1cd6d826ee Remasters Toricrates 2019-08-15 18:36:33 +08:00
Jay
f17aea268c Donator item 2019-08-11 01:07:20 -05:00
lolman360
ccb2d91c90 Update hats.dmi 2019-08-11 15:17:46 +10:00
lolman360
06bd8b8f20 Create hats.dmi 2019-08-11 15:14:49 +10:00
lolman360
b8a90fb742 Delete hats.dmi 2019-08-11 15:12:11 +10:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
lolman360
400c117fd0 yeetus those dmis my man 2019-08-11 11:56:48 +10:00
TrilbySpaceClone
5bd6f88226 Falsehoods 2019-08-08 18:27:01 -04:00
TrilbySpaceClone
893c9c9c63 A correction? 2019-08-08 17:45:58 -04:00
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00