shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,166 Commits 5 Branches 0 Tags
72cbb77eccfa56d6dccfa849dab58c8bd8f01ceb
Commit Graph

1457 Commits

Author SHA1 Message Date
kevinz000
72cbb77ecc fixes 2020-04-30 00:48:37 -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
kevinz000
038cb5c911 Merge pull request #11849 from Ghommie/Ghommie-cit680 
Removes pixel offsets from box dorms lockers/dressers etcetera.
 2020-04-17 05:09:37 -07:00
Ghom
044d360d20 Merge pull request #11877 from Detective-Google/lambda-fixes 
Fixes a bunch of gripes people had with lambda.
 2020-04-17 08:55:14 +02:00
Detective Google
78527739e3 moves a tiny fan away from the very angry ball of lightning 2020-04-16 17:21:25 -05:00
Detective Google
16b02495ae fixes the exe- valid room not being wired to the grid 2020-04-16 16:21:43 -05:00
Detective Google
c7f7012eb2 adds more grounding rods (due to reported tesla issues), fixes emitter wire 2020-04-16 01:03:12 -05:00
Detective Google
6f82440107 fixes a bunch of junk 2020-04-15 23:22:39 -05:00
UristMcAstronaut
ec452de0b2 Merge remote-tracking branch 'upstream/master' 2020-04-15 08:41:17 +00:00
Linzolle
39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
UristMcAstronaut
b6bbe1738e Add files via upload 2020-04-14 16:57:34 +00:00
UristMcAstronaut
c7b174676b Add files via upload 2020-04-14 16:15:31 +00:00
Ghommie
30268ed875 Removes pixel offsets from dorms lockers etcetera. 2020-04-14 03:05:32 +02:00
kappa-sama
94bcc6a64b removes these 2020-04-13 14:38:30 -04:00
kevinz000
80de717dc8 Merge pull request #11824 from Ghommie/Ghommie-cit673 
Fixes occasional tunnel hole in the space hermit ruin.
 2020-04-12 17:02:52 -07:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
Ghom
f0c9a15fdb Merge pull request #11762 from Kraseo/whoopsie 
hey guess who forgot about kilo's public mining shuttle dock
 2020-04-12 06:29:05 +02:00
Ghommie
ab3ed7f9c2 Space Hermit Ruin fixes. 2020-04-11 23:27:19 +02:00
Putnam3145
295a4e0238 ass-covering (#11788) 2020-04-09 16:19:57 +02:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
kevinz000
ffa7f198a0 Merge pull request #11752 from EmeraldSundisk/cogfix1 
Some door fixes for CogStation.
 2020-04-09 02:37:55 -07: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
cb187dd944 corrections? 2020-04-07 07:36:20 -04:00
Trilbyspaceclone
a6e07e5427 Merge branch 'master' into found_and_hidden 2020-04-07 03:37:09 -04:00
EmeraldSundisk
f78903a2e6 Update job_changes.dm 2020-04-06 20:32:19 -07:00
EmeraldSundisk
3953e64d5b Revert "4/6" 
This reverts commit 0139a2543d.
 2020-04-06 18:39:57 -07:00
EmeraldSundisk
0139a2543d 4/6 2020-04-06 16:07:21 -07:00
Trilbyspaceclone
ee1cb5f8c5 yay fixes (#11756) 2020-04-06 17:51:07 +02:00
Kraseo
df277721d7 public mining is gone crab crab crab 2020-04-06 16:21:06 +02:00
EmeraldSundisk
8b46cb2866 Create job_changes.dm 2020-04-05 09:13:10 -07:00
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
Kraseo
70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
TrilbySpaceClone
62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
raspyosu
f735a2319a it (#11721) 
yeah
 2020-04-04 00:47:18 +02:00
EmeraldSundisk
baa320d16f Add files via upload 2020-04-03 12:38:26 -07:00
Ghommie
45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Putnam3145
ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662 
Intellectual property infringment is not cool.
 2020-04-02 06:18:41 -07:00
Ghommie
e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
dapnee
6f4281b4b8 Even More fixes to Lambda (#11604) 
* Update lambda.dmm

even MORE fixes

* Update lambda.dmm

some more vents in maintenance, air canisters, and mystery coin

* Update lambda.dmm

more shit

* darn you ghommie

hopefully fixes conflicts

* Create lambda.dmm

okay, let's try this

* Update lambda.dmm

fingers crossed
 2020-04-01 16:19:10 +02:00
kevinz000
b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck 
holodeck WRESTLING
 2020-03-31 18:03:00 -07:00
Kraseo
a8759b048e smashes the tyranny of public mining 2020-03-31 23:32:15 +02:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) 
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
 2020-03-31 22:04:55 +02:00
Ghommie
2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00
KathrinBailey
f4d304bfcf I FORGOT TO RE-ADD HOOCHMASTER AGAIN 
HOW COULD I DO THIS poor hoochmaster I am so so sorry this is the second time I am sorry bartender mains.
 2020-03-30 01:29:44 +01:00
KathrinBailey
3f800c179c map merged should be no conflicts? 2020-03-30 01:08:45 +01:00
KathrinBailey
d27c802859 wait so I literally copied from master and did stuff again and it has merge conflicts, do not merge until another commit goes through 2020-03-30 00:44:59 +01:00
KathrinBailey
b52f8148cb Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-03-30 00:32:31 +01:00
KathrinBailey
b3750207e9 Merge Conflicts 
Changes redone.
 2020-03-30 00:11:34 +01:00
Timothy Teakettle
2caeaba8dc moves two tables 2020-03-29 14:17:00 +01:00