shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

9531 Commits

Author SHA1 Message Date
Ghommie b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
kevinz000 8f29839dbf Runechat Port (#12065) 
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
 2020-05-03 03:53:19 +02:00
kevinz000 c1436c4c7b Maptick lag minimization port (#12066) 
* extools.dll

* backend

* queued pipenet builds

* oh yeah we don't have that

* wow

* Update air.dm
 2020-05-03 03:34:33 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000 5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718 
Fixing more issues.
 2020-05-02 15:56:28 -07:00
kevinz000 5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 
Webedit bugfixes
 2020-05-02 15:56:22 -07:00
kevinz000 b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
 2020-05-02 15:55:19 -07:00
kevinz000 fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
Detective-Google 6db5655ceb Merge branch 'master' into 91-files-changed-fml 2020-05-02 17:16:18 -05:00
Lin f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie 7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghommie c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Detective Google 2290deb9d7 fixes snowlegion portals dropping proper legions instead of skeles 2020-05-01 22:23:19 -05:00
Detective Google 13aa536027 makes the wendigo fight have the same atmos as the surrounding icemoon 2020-05-01 20:13:53 -05:00
Ghommie 202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
Ghom 8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
Ghom 400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
Ghommie b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +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
kevinz000 f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
Ghommie a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
kevinz000 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
Putnam3145 0019b5a742 Game info verb for ghosts (#11935) 
* Some ghost QoL stuff

* DNR/observer only
 2020-05-01 18:02:00 +02:00
Detective Google 231fd0edea fixes the stupid fucking tile placing list 2020-04-30 23:04:35 -05:00
Detective Google c911d81cdc fixes the volanic subtypes of the other thing 2020-04-30 21:21:59 -05:00
Detective Google 6316b02e68 unfucks changeturf for the more_caves 2020-04-30 21:17:41 -05:00
Detective Google 9c049ef02b more mapping fixes 2020-04-30 21:02:31 -05:00
kevinz000 c9cd134132 linter fix 2020-04-30 17:39:30 -07:00
Detective Google df2b622007 nukes the SpawnTerrain proc used for tg geysers 2020-04-30 19:34:27 -05:00
Detective-Google c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google 41d1dd1763 fixes the maps 2020-04-30 18:13:02 -05:00
Detective Google f6736e862d it compiles, now to fix the maps 2020-04-30 15:49:06 -05: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 02265010d6 fixes 2020-04-30 10:07:17 -07:00
kevinz000 7e8ebfde83 whew 2020-04-30 10:03:35 -07:00
kevinz000 034499f356 new stuff 2020-04-30 09:59:08 -07:00
kevinz000 8dae739d8f fixes 2020-04-30 01:39:38 -07:00
kevinz000 bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
kevinz000 f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
kevinz000 72cbb77ecc fixes 2020-04-30 00:48:37 -07:00
kevinz000 d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft 
More Useful Gauze MK II
 2020-04-29 12:02:51 -07:00
kevinz000 830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller 
Some more admeme potential for dynamic
 2020-04-29 12:02:21 -07:00
kevinz000 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
Lin 64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2 
Fixes cybernetics not updating slowdowns when dropping shield
 2020-04-29 01:07:55 +00:00
ZeroMan 18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
Lin 68bad2ee3f Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6 
fixes shield bashing working while downed
 2020-04-27 16:24:29 +00:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00