Commit Graph

2359 Commits

Author SHA1 Message Date
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
silicons
904990a037 Merge pull request #15584 from Arturlang/StasisBeds
Stasis beds
2022-04-08 09:47:26 -07:00
silicons
c8cab13081 Merge pull request #15565 from SandPoot/custom-statues
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07:00
Artur
813ca511b5 Remaps sleepers to stasis beds and make stasis actually leave you 2022-04-06 15:58:27 +03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
TripleShades
af197ce22e lizard man points local mapper at the debug tools
local mapper goes FUCKING BONKERS
2022-03-29 02:12:32 -04:00
Lin
a8a9663832 Merge pull request #15568 from TripleShades/delda
Omega Tcomms and Gravgen Pipes
2022-03-22 01:55:22 +00:00
TripleShades
80bdb7b540 Update OmegaStation.dmm 2022-03-20 17:19:01 -04:00
evan
739c4708b6 Hey what if no dead ends 2022-03-19 19:04:25 -04:00
SandPoot
9715f23a66 A single free chisel 2022-03-18 19:56:06 -03:00
SandPoot
e06d709976 Hate 2022-03-18 19:27:08 -03:00
SandPoot
877c47c962 Remember to beat your var editing mappers 2022-03-18 18:59:53 -03:00
TripleShades
90d1025fbb Update OmegaStation.dmm 2022-03-18 16:56:04 -04:00
TripleShades
bcf5be78f0 Update OmegaStation.dmm 2022-03-18 01:12:00 -04:00
TripleShades
f01338c0e7 Update OmegaStation.dmm 2022-03-18 01:06:43 -04:00
TripleShades
90c42624b3 Update OmegaStation.dmm 2022-03-18 00:56:17 -04:00
TripleShades
164c483796 Update OmegaStation.dmm 2022-03-18 00:53:09 -04:00
SandPoot
f4b74119cf try to force it through by just changing path 2022-03-16 18:37:13 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
TripleShades
f4db732446 Update MetaStation.dmm 2022-03-14 18:05:34 -04:00
TripleShades
f70745bf6a Update OmegaStation.dmm 2022-03-12 16:34:39 -05:00
TripleShades
a6d351a091 i hate decals 2022-03-11 16:47:12 -05:00
TripleShades
60f085cdcd god why are the decals like this 2022-03-11 16:44:21 -05:00
TripleShades
f7bcdb5415 Update OmegaStation.dmm 2022-03-11 16:38:50 -05:00
TripleShades
0791a41346 Update OmegaStation.dmm 2022-03-11 16:38:23 -05:00
TripleShades
d38c1dd3db Update OmegaStation.dmm 2022-03-06 19:37:55 -05:00
TripleShades
967d07c83d Update OmegaStation.dmm 2022-03-06 19:34:34 -05:00
TripleShades
5286dcacbf Update OmegaStation.dmm 2022-03-06 19:30:56 -05:00
TripleShades
7898c971ea Omega Station Again (#15531)
* Update OmegaStation.dmm

* Update OmegaStation.dmm
2022-03-02 18:45:39 -08:00
TripleShades
1678d8a551 Update OmegaStation.dmm 2022-02-23 02:51:55 -05:00
TripleShades
e49f5c4d84 Update OmegaStation.dmm 2022-02-23 00:36:47 -05:00
TripleShades
982b29d505 Update OmegaStation.dmm 2022-02-22 23:21:34 -05:00
TripleShades
d96c703d88 Update OmegaStation.dmm 2022-02-22 23:21:00 -05:00
TripleShades
f2c14bcaf2 Update OmegaStation.dmm 2022-02-22 03:28:39 -05:00
TripleShades
85569cc9a8 Update OmegaStation.dmm 2022-02-21 15:12:37 -05:00
TripleShades
a127b49599 Update OmegaStation.dmm 2022-02-20 23:14:20 -05:00
TripleShades
11bfc18714 Update OmegaStation.dmm 2022-02-20 22:57:59 -05:00
TripleShades
3e1e24f6a0 Update OmegaStation.dmm 2022-02-20 22:47:44 -05:00
Lin
5e38f2fa21 Merge pull request #15510 from TripleShades/omega-fix
Omega Station Fixes/Tweaks
2022-02-20 01:08:50 +00:00
TripleShades
7a0ebafe43 Update OmegaStation.dmm 2022-02-18 17:51:34 -05:00
TripleShades
6e429c2742 Update OmegaStation.dmm 2022-02-18 17:49:56 -05:00
TripleShades
a2f16c916d Update OmegaStation.dmm 2022-02-18 17:42:54 -05:00
TripleShades
f7dcc2d297 Update OmegaStation.dmm 2022-02-18 17:35:19 -05:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Lin
d7cbb017f6 Fix few instances of bleeding white blood (#15398)
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
MrJWhit
d942664b7f Update OmegaStation.dmm 2022-01-03 23:14:06 -05:00
MrJWhit
e7571c42be Update OmegaStation.dmm 2022-01-03 23:11:09 -05:00
Lin
e62214af38 Merge pull request #15446 from MrJWhit/golden-omega
Making Omega Playable
2022-01-03 22:35:20 +00:00
TripleShades
a0e3dd5205 Meta Atmos Layout (#15445)
* Update MetaStation.dmm

* Update MetaStation.dmm

* Update MetaStation.dmm
2022-01-02 02:15:21 +01:00
MrJWhit
2fa435f992 Update OmegaStation.dmm 2021-12-29 16:18:54 -05:00