Commit Graph

56 Commits

Author SHA1 Message Date
silicons
4a52580c89 Merge pull request #13205 from EmeraldSundisk/cogfeex
Small fixes for CogStation.
2020-08-22 15:20:50 -07:00
EmeraldSundisk
c521d2502e Add files via upload 2020-08-18 18:27:06 -07:00
EmeraldSundisk
5e9af664ec Update CogStation.dmm 2020-08-17 20:39:54 -07:00
EmeraldSundisk
0763436a1c Update CogStation.dmm 2020-08-13 23:06:09 -07:00
silicons
16306ad38b e 2020-08-10 18:14:34 -07:00
Artur
732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
EmeraldSundisk
bf97828e5e Add files via upload 2020-07-09 21:06:27 -07:00
EmeraldSundisk
4f17e7ab1d Update CogStation.dmm 2020-07-09 18:34:29 -07:00
EmeraldSundisk
b22f73e27f Update CogStation.dmm 2020-07-09 18:17:42 -07:00
EmeraldSundisk
e0428e946e Update CogStation.dmm 2020-07-09 12:46:29 -07:00
Artur
2158278a6f Fixes cog 2020-07-07 18:44:54 +03:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
EmeraldSundisk
672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk
75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07:00
EmeraldSundisk
d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00
EmeraldSundisk
45a14f16d4 Revert "?"
This reverts commit c6b5bac0d8.
2020-07-04 21:39:23 -07:00
EmeraldSundisk
c6b5bac0d8 ? 2020-07-04 21:33:29 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +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
42ae6233db aeugh 2020-06-25 15:18:11 -05:00
Detective Google
5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
Detective Google
f33586a4b5 coggers 2020-06-25 14:41:03 -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
kevinz000
bd9ce04471 some cog touchups (#12538) 2020-06-16 23:32:14 -07: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
882c11e0e5 This is every single onstation gateway r-r-ight? 2020-06-16 20:53:56 +03:00
Detective Google
6ec28cd914 some cog touchups 2020-06-14 16:26:19 -05:00
Trilbyspaceclone
f42994c79b Toxin tweaks! Just storage (#12363)
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
2020-06-09 05:34:22 -07:00
EmeraldSundisk
2ac1ada029 Add files via upload 2020-05-31 19:52:00 -07: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
EmeraldSundisk
29108e6cd6 Update CogStation.dmm 2020-05-28 19:59:41 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
EmeraldSundisk
10d8ef79db Update CogStation.dmm 2020-04-19 20:33:35 -07: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
EmeraldSundisk
8b46cb2866 Create job_changes.dm 2020-04-05 09:13:10 -07:00
EmeraldSundisk
baa320d16f Add files via upload 2020-04-03 12:38:26 -07:00
EmeraldSundisk
ac93fecf2c Add files via upload 2020-03-27 19:46:04 -07:00
EmeraldSundisk
a96857a401 Update CogStation.dmm 2020-03-26 08:54:08 -07:00
EmeraldSundisk
4f8e36ebd6 Update CogStation.dmm 2020-03-24 16:50:46 -07:00
EmeraldSundisk
a000220157 Update CogStation.dmm 2020-03-23 12:46:39 -07:00
EmeraldSundisk
9337536897 Update CogStation.dmm 2020-03-22 22:05:16 -07:00
EmeraldSundisk
0a539949a0 Update CogStation.dmm 2020-03-22 10:19:13 -07:00