 Detective Google
|
7b03bbbcb2
|
whoopps
|
2020-05-02 18:34:31 -05:00 |
|
|
Detective Google
|
5bef1281a4
|
Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml
|
2020-05-02 17:45:02 -05:00 |
|
|
Detective Google
|
25d84a6317
|
brings the engioutpost ruin over as well
|
2020-05-02 17:44:23 -05:00 |
|
|
Detective-Google
|
6db5655ceb
|
Merge branch 'master' into 91-files-changed-fml
|
2020-05-02 17:16:18 -05:00 |
|
|
Detective Google
|
13aa536027
|
makes the wendigo fight have the same atmos as the surrounding icemoon
|
2020-05-01 20:13:53 -05:00 |
|
|
MrJWhit
|
61f6631486
|
Update engine_sm.dmm (#12062)
|
2020-05-01 18:26:50 +02:00 |
|
|
Detective Google
|
8af556e014
|
backwards couch backwards couch
|
2020-05-01 11:03:15 -05:00 |
|
|
Detective Google
|
daff847d93
|
fixes wendigo cave having no air
|
2020-05-01 01:58:31 -05:00 |
|
|
Detective Google
|
7ef5246b19
|
fixes a bunch of mismatch atmos in ruins
|
2020-05-01 01:33:14 -05:00 |
|
|
kevinz000
|
8677e3b112
|
dmm2tgm
|
2020-04-30 19:14:44 -07:00 |
|
|
Detective-Google
|
c146c898c0
|
Merge branch 'master' into 91-files-changed-fml
|
2020-04-30 18:42:38 -05:00 |
|
|
Detective Google
|
41d1dd1763
|
fixes the maps
|
2020-04-30 18:13:02 -05:00 |
|
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
|
MrJWhit
|
7831b53932
|
Links up the rad shutters
|
2020-04-29 14:03:17 -04:00 |
|
|
kevinz000
|
da61b04ed0
|
Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
|
2020-04-25 16:53:48 -07:00 |
|
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05:00 |
|
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
|
MrJWhit
|
eafdae5e66
|
Swaps out some catwalks for latices to make travis happy
|
2020-04-22 14:01:11 -04:00 |
|
|
MrJWhit
|
4fc041d4f4
|
teg hot no hot
aaaaaaah
|
2020-04-21 19:43:38 -04:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
Ghommie
|
ab3ed7f9c2
|
Space Hermit Ruin fixes.
|
2020-04-11 23:27:19 +02:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
kevinz000
|
8b2132317b
|
Ports a rewritten version of BAYSTRUMENTS (#11680)
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-04-07 15:21:50 +02:00 |
|
|
Kraseo
|
a8759b048e
|
smashes the tyranny of public mining
|
2020-03-31 23:32:15 +02:00 |
|
|
KathrinBailey
|
52138696d0
|
PROTO KINETIC dream CRUSHER
oh yeah give me all the shutters daddy
|
2020-03-26 13:08:37 +00:00 |
|
|
kevinz000
|
ea7c1058b5
|
Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
|
2020-03-23 10:40:31 -07:00 |
|
|
keronshb
|
830f646383
|
Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
|
2020-03-22 15:55:08 -04:00 |
|
|
Ghommie
|
86898cc451
|
Force pushed updates
|
2020-03-22 01:43:19 +01:00 |
|
|
Hatterhat
|
ab7fc2dc72
|
me and the boys stealing prs (#11517)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2020-03-19 13:38:31 +01:00 |
|
|
MrJWhit
|
252a97566f
|
fract stop yelling
asdf
|
2020-03-05 21:28:30 -05:00 |
|
|
Ghom
|
d78cdb9b37
|
Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
|
2020-03-04 23:46:10 +01:00 |
|
|
BlackMajor
|
43e77f7d3a
|
Last few fixes. Adds arcane wand to dead wizard roid.
|
2020-03-04 19:12:56 +13:00 |
|
|
YakumoChen
|
1e34e3d081
|
Add files via upload
|
2020-03-01 05:19:27 -05:00 |
|
|
YakumoChen
|
cc2e0a6440
|
makes mining base less ugly
|
2020-03-01 03:45:03 -05:00 |
|
|
BlackMajor
|
fc4f9e7800
|
How about a few more roids.
|
2020-02-28 16:07:57 +13:00 |
|
|
BlackMajor
|
be740ba690
|
Merge branch 'master' into SpaceRuins
|
2020-02-26 20:58:46 +13:00 |
|
|
Ghom
|
ea5774e713
|
Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
|
2020-02-25 14:41:40 +01:00 |
|
|
Ghom
|
5adfb5ca46
|
Merge pull request #11212 from r4d6/engine
Fix AM engine map
|
2020-02-25 14:23:56 +01:00 |
|
|
BlackMajor
|
f2fe25d118
|
Updates maps with ruin border. Lowers ore gen on roids.
|
2020-02-25 17:33:18 +13:00 |
|
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05:00 |
|
|
BlackMajor
|
ca6341aac4
|
Merge branch 'master' into SpaceRuins
|
2020-02-24 19:47:52 +13:00 |
|
|
r4d6
|
12ea22fdbf
|
Fix
|
2020-02-23 14:52:12 -05:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Ghom
|
91cbc8fb3c
|
Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
|
2020-02-21 02:43:30 +01:00 |
|
|
BlackMajor
|
984b57560b
|
Fixes cults being able to summon at ruins. As well as stops the ash storm sound.
|
2020-02-21 01:39:16 +13:00 |
|
|
BlackMajor
|
cf0b1bbac6
|
Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station.
|
2020-02-21 00:22:50 +13:00 |
|
|
MrJWhit
|
c498b1df95
|
Quick TEG update
asdf
|
2020-02-19 22:00:15 -05:00 |
|
|
kevinz000
|
aeb8087441
|
Merge pull request #10904 from Hatterhat/golem-ship-gps
granting golems GPSes that are off by default
|
2020-02-19 19:00:24 -07:00 |
|
|
BlackMajor
|
9a54b451eb
|
Added two more ruins, Owai's suggestions.
|
2020-02-18 12:57:48 +13:00 |
|