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

1041 Commits

Author SHA1 Message Date
MrJWhit
861734d119 Updates icebox atmos to box atmos (#12299) 2020-05-20 18:47:54 -07:00
Ghom
3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

* yes.
 2020-05-20 18:45:36 -07:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
jjpark-kb
cbc208375d [Map Fix] Button and Wall (#12285) 2020-05-16 22:29:43 +02:00
Trilbyspaceclone
b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147) 
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
 2020-05-15 07:54:25 -07:00
Ghommie
29ce144e94 Delta. 2020-05-14 01:24:47 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
MrJWhit
44bb989ff9 Delta station opening of atmos (#12237) 
* Opening up delta atmos

* Final fixes

* adjustment to recheck travis
 2020-05-13 21:00:12 +02:00
jjpark-kb
1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239) 
* map fixes

* reverting delta fix for PR conflict
 2020-05-13 20:56:56 +02:00
kevinz000
5a905b2f02 Fixes boxstation (#12236) 
* revert

* ok
 2020-05-13 03:15:17 +02:00
kevinz000
e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry 
Moves fire alarm in box station in the chem department
 2020-05-12 12:28:41 -07:00
Ghommie
84af9d9d40 wtf 2020-05-12 21:12:17 +02:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
MrJWhit
b5a18ccba5 should be good??? 2020-05-11 00:09:25 -04:00
MrJWhit
2a9746b34a Pubby atmos opening up (#12117) 
* First update, atmos control room

* finalization

* Final bugfixes

* final update
 2020-05-09 02:55:07 +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
MrJWhit
2ce118f851 MetaStation atmos update (#12099) 
* Finishes up meta station atmos

* Update MetaStation.dmm
 2020-05-04 05:05:27 +02:00
MrJWhit
a5c3e3ff2b Oh god please let this be the final boxstation update (#12089) 2020-05-03 03:53:44 +02:00
kevinz000
ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
MrJWhit
6b4747d5fe Meta station atmos opening up (#12047) 
* Spawning area fix.

Part one of many

* Finishing up atmos

* Haha final fixes

* Security camera update

* Haha whoops, thanks lilly
 2020-05-01 21:26:36 +02:00
MrJWhit
5bdafb78c1 Minor updates to pubby for fixing (#12059) 
* updates to pubby

* Dear justin, double check something BEFORE publishing it
 2020-05-01 18:56:40 +02:00
ZeroMan
52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
kevinz000
619609f5ff Merge pull request #12020 from bunny232/master 
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
 2020-04-29 12:01:11 -07:00
kevinz000
1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors 
Kilo station improvements
 2020-04-29 11:59:26 -07:00
ZeroMan
22d6ac78e1 i actually despise coding 2020-04-28 12:26:33 -04:00
ZeroMan
c5107f8fe0 i actually despise coding 2020-04-28 12:25:48 -04:00
ZeroMan
041d7ce4bc i have committed warcrimes 2020-04-28 02:56:38 -04:00
ZeroMan
40f7472410 i actually despise coding 2020-04-28 02:47:28 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
TrilbySpaceClone
39e460d795 Kevs request 2020-04-27 07:16:00 -04:00
kevinz000
6ff9d54e4f Merge pull request #11947 from MrJWhit/vg-atmos-box 
Ports /vg/ atmos map for boxstation
 2020-04-25 17:01:34 -07:00
bunny232
a245741f3e Update BoxStation.dmm 2020-04-25 07:58:08 -04:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom
a831b3b623 Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine 
Quick fixing up of pubbystation things
 2020-04-24 21:29:32 +02:00
TrilbySpaceClone
a3379089a6 Decal delete 2020-04-24 11:26:21 -04:00
MrJWhit
cc9d3b485a Removes putnam upsetti mixer 2020-04-24 00:47:11 -04:00
MrJWhit
100d7cffd2 Also fix that one maint door to be a maint door 2020-04-23 19:20:43 -04:00
MrJWhit
037ea6e073 fixing up the engine 2020-04-23 18:26:39 -04:00
MrJWhit
a621474ae7 Adds a missing wire and a second SMES to the AI sat 2020-04-23 18:10:56 -04:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
MrJWhit
8e7728c216 Reduce atmos suits, add pump to waste from mix, turn off air to waste pump 2020-04-22 14:18:00 -04:00
MrJWhit
286d1298fd Fixes for atmos 
Sure are some gosh dilly dang fixes
 2020-04-21 22:44:07 -04:00
nik707
5e1c6ae58e Merge pull request #11945 from EmeraldSundisk/cogfix2.1 
Cogfix2.1
 2020-04-21 09:23:16 -05:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
MrJWhit
f498fb106a Update BoxStation.dmm 
Aaaaah
 2020-04-20 05:25:20 -04:00
EmeraldSundisk
10d8ef79db Update CogStation.dmm 2020-04-19 20:33:35 -07:00