shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,398 Commits 5 Branches 0 Tags
173ecfaa6cbcc8053eecaa1fc305cb4e059caa12
Commit Graph

143 Commits

Author SHA1 Message Date
dapnee
cb17ea4874 More Active Turf Fixes 
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
 2020-08-04 12:16:29 -06: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
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
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
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
Artur
ffb2678eb0 Lets hope this fixes it 2020-05-22 22:52:41 +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
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Putnam3145
295a4e0238 ass-covering (#11788) 2020-04-09 16:19:57 +02:00
kevinz000
b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden 
Atomic PR 1 or 2 - Toilet Mapping!
 2020-04-09 02:11:43 -07: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
TrilbySpaceClone
62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Poojawa
5db9b3432f Update moonoutpost19.dmm 2019-09-12 00:19:56 -05:00
Poojawa
dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00