kevinz000
|
f034c7c536
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-05 17:38:43 -07:00 |
|
Putnam
|
801956a1f9
|
Reverts #10352.
|
2020-05-03 17:44:00 -07: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
kevinz000
|
4e8a8dbebd
|
Update items.dm
|
2020-04-27 02:55:11 -07:00 |
|
kevinz000
|
f70490c61d
|
fixes
|
2020-04-26 04:40:18 -07:00 |
|
kevinz000
|
2e35a42f43
|
wow lotsa effort huh
|
2020-04-26 04:10:38 -07:00 |
|
kevinz000
|
ff9f18bdbd
|
wow lotsa effort huh
|
2020-04-26 03:38:41 -07:00 |
|
kevinz000
|
bf7962d8f9
|
wow lotsa effort huh
|
2020-04-26 03:36:09 -07:00 |
|
kevinz000
|
aeaf6ea102
|
wow lotsa effort huh
|
2020-04-26 03:33:08 -07:00 |
|
kevinz000
|
e3b987879e
|
wow lotsa effort huh
|
2020-04-26 03:30:18 -07:00 |
|
kevinz000
|
a9d0ce45b9
|
wow lotsa effort huh
|
2020-04-26 03:29:43 -07:00 |
|
kevinz000
|
af3651172c
|
wow lotsa effort huh
|
2020-04-26 03:29:31 -07:00 |
|
Putnam
|
00c2ddce8f
|
Actually this is better
|
2020-04-25 23:18:37 -07:00 |
|
Putnam
|
3da4701dff
|
Switch roundstart thing to initial.
|
2020-04-25 23:06:15 -07:00 |
|
kevinz000
|
5c20bde9f0
|
Update shields.dm
|
2020-04-25 20:58:22 -07:00 |
|
Putnam
|
257de9d4c9
|
Adds uplinks back to nukies.
|
2020-04-25 19:22:55 -07:00 |
|
Putnam
|
d7c0834794
|
A couple important comments.
|
2020-04-25 17:22:12 -07:00 |
|
Putnam
|
b9e88f85bb
|
Allowed better admeme stuff for dynamic
|
2020-04-25 17:15:17 -07:00 |
|
kevinz000
|
565bfdb7b0
|
Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt Australian crew buff.
|
2020-04-25 17:10:33 -07:00 |
|
kevinz000
|
af08e0fecf
|
Merge pull request #11984 from Hatterhat/fastpump
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
|
2020-04-25 17:07:29 -07:00 |
|
kevinz000
|
d7f38faab9
|
Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
|
2020-04-25 17:05:38 -07:00 |
|
kevinz000
|
da61b04ed0
|
Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
|
2020-04-25 16:53:48 -07:00 |
|