SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
silicons
|
c8cab13081
|
Merge pull request #15565 from SandPoot/custom-statues
Custom statues and sculpting changes.
|
2022-04-06 12:12:24 -07: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 |
|
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 |
|
zerothebigboy
|
e6612e3f15
|
lol lmao kek wtf
|
2021-09-24 19:32:08 -04:00 |
|
zerothebigboy
|
90930494d6
|
k
|
2021-05-05 18:43:11 -04:00 |
|
zerothebigboy
|
c8ebe720ec
|
k
|
2021-05-05 18:25:05 -04:00 |
|
zerothebigboy
|
f4af7bb28f
|
ihatetheantichrist
|
2021-05-05 06:39:21 -04:00 |
|
zerothebigboy
|
e87e71c6c8
|
i'mcryingi'mcrying
|
2021-05-05 05:53:57 -04:00 |
|
zerothebigboy
|
5138d86655
|
skylarlineman'safurry
|
2021-05-05 03:35:25 -04:00 |
|
silicons
|
cf69e0fb69
|
Rename emergency_airless.dmm to emergency_construction.dmm (#14656)
|
2021-04-25 12:55:46 +02:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Letter N
|
69a054826b
|
add art areas on meta, and adds lapvend on box,delta,meta.
Other map changes are cosmetic.
|
2021-03-10 16:34:37 +08:00 |
|
Hatterhat
|
cb40ad4764
|
atomization is cowardice actually
|
2021-01-12 16:08:17 -06:00 |
|
Hatterhat
|
a8f1960c5b
|
disregard the branch name
|
2020-12-27 01:14:12 -06:00 |
|
The0bserver
|
4559a153c3
|
Map Tweak
|
2020-11-27 16:51:55 -05:00 |
|
The0bserver
|
5e9e984fd0
|
a few more crumbs we missed. Travis might be happy now.
|
2020-11-20 18:45:32 -05:00 |
|
The0bserver
|
56b6a42bb8
|
Tweaks, making sure code is right. Pain is infinite.
Tin
|
2020-11-20 03:54:28 -05:00 |
|
The0bserver
|
6d1ace27f7
|
Initial Commit: Mapping is painful
|
2020-11-18 00:38:35 -05:00 |
|
Ghommie
|
f49f72338f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
|
2020-10-25 15:01:57 +01:00 |
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
Detective Google
|
8167f047f9
|
Update snow_taxi.dmm
|
2020-10-17 19:29:13 -05:00 |
|
silicons
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
Detective Google
|
81f7307575
|
yeah
|
2020-08-14 15:38:27 -05:00 |
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
Sishen
|
3a8675048a
|
Update whiteship_box.dmm
|
2020-08-07 21:16:52 -06:00 |
|
Sishen
|
2d53eceb86
|
Update whiteship_box.dmm
|
2020-08-06 12:31:04 -06:00 |
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
silicons
|
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 |
|
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 |
|
Detective Google
|
57fca41e20
|
aeugh2
|
2020-06-25 15:22:11 -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 |
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
Trilbyspaceclone
|
51da7dfa71
|
Merge branch 'master' into spike-loot-differentces
|
2020-06-17 02:36:52 -04:00 |
|
SmArtKar
|
170a38a3a7
|
Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/
* Recipes fix
|
2020-06-16 16:22:56 -07:00 |
|
Timothy Teakettle
|
2d1d2eeda6
|
final fixes
|
2020-06-16 23:47:22 +01:00 |
|
Timothy Teakettle
|
779e15f3b5
|
map fixes
|
2020-06-16 17:16:31 +01:00 |
|
Timothy Teakettle
|
d10dfbec5e
|
fix maps but it works
|
2020-06-16 16:23:53 +01:00 |
|
timothyteakettle
|
b59c8c1af6
|
fix maps
|
2020-06-16 02:44:11 +01:00 |
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
TrilbySpaceClone
|
b62ef0f4e8
|
right...
|
2020-06-02 19:44:47 -04:00 |
|
Ghom
|
1c3bfa623f
|
Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
|
2020-06-02 23:48:50 +02:00 |
|
Ghommie
|
1bca74465f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-30 03:29:02 +02:00 |
|
Ghom
|
6756b564b7
|
Removing that one keg. (#12333)
|
2020-05-24 13:07:53 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Detective Google
|
6e5e1b249f
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-12 18:38:28 -05:00 |
|