 MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
|
siliconsandGitHub
|
2b273addf1
|
Merge pull request #13618 from Vynzill/mappinghell
new jungle gateway map
|
2020-11-07 00:19:11 -07:00 |
|
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
|
Vynzill
|
ff6850b9b0
|
jungle gateway map
|
2020-10-23 15:11:27 -05:00 |
|
|
Vynzill
|
5f75151c51
|
junglemap
|
2020-10-21 17:00:28 -05:00 |
|
|
Detective Google
|
86871a92fc
|
fixes the door bolts on the snow cabin
|
2020-10-02 11:41:43 -05:00 |
|
|
siliconsandGitHub
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
|
Cirno
|
020da9fa07
|
i hope this works
|
2020-07-04 15:47:38 -03:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
Artur
|
0e51afade9
|
Mhhhmmm pure !!fun!!
|
2020-07-02 02:06:27 +03:00 |
|
|
Artur
|
3bcfe84c35
|
People, do you realize gateways dont need cabling?
|
2020-07-02 01:58:49 +03:00 |
|
|
Artur
|
2931c03ccb
|
Ghommie fixes
strongDMM autofixed wildest, hopefully it didnt break anything
|
2020-07-02 01:48:28 +03:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03:00 |
|
|
Detective Google
|
5b0886a150
|
and that's all folks (for now)
|
2020-06-22 20:32:12 -05:00 |
|
|
Detective Google
|
a406927c95
|
euthanizes spacebattle, helps wildwest a little (it's still shit)
|
2020-06-22 20:31:14 -05:00 |
|
|
Detective Google
|
98756b3bc7
|
snowdin is wack
|
2020-06-22 20:24:19 -05:00 |
|
|
Detective Google
|
46805bc872
|
more progress
|
2020-06-22 20:11:18 -05:00 |
|
|
Detective Google
|
a8b6bb7957
|
step 2; de-looting the caves
|
2020-06-22 19:46:48 -05:00 |
|
|
Detective Google
|
dc81519380
|
whoops me forget to hit save first
|
2020-06-22 19:29:01 -05:00 |
|
|
Detective Google
|
d4dd1a162a
|
loot-yeet #1; wizard academy
|
2020-06-22 19:28:47 -05:00 |
|
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
Detective Google
|
4e26916502
|
Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald
|
2020-06-20 14:00:14 -05:00 |
|
|
Detective Google
|
898480af84
|
fixes some missing icon statesa on moonoutpost and UO45
|
2020-06-17 19:48:28 -05:00 |
|
|
Detective Google
|
0e1db216c8
|
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
|
2020-06-17 19:33:14 -05:00 |
|
|
SmArtKarandGitHub
|
170a38a3a7
|
Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/
* Recipes fix
|
2020-06-16 16:22:56 -07:00 |
|
|
Artur
|
78ff5727cd
|
Hopefully fixed the away mission gateways
|
2020-06-16 21:18:58 +03:00 |
|
|
Artur
|
bc30fb7710
|
Hard resets _maps to master
|
2020-06-16 16:09:05 +03:00 |
|
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
Ghommie
|
757706653d
|
Map paths.
|
2020-05-12 21:01:34 +02:00 |
|
|
Ghommie
|
58fc679cce
|
WIP
|
2020-04-24 20:49:15 +02:00 |
|