kevinz000
|
36cebc733c
|
Merge pull request #11039 from Ghommie/Ghommie-cit572
Something about a couple runtimes.
|
2020-02-15 12:19:50 -07:00 |
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
kevinz000
|
ee9b38017e
|
Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
|
2020-02-15 12:17:02 -07:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
kevinz000
|
b9e8be5784
|
Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
|
2020-02-15 12:15:50 -07:00 |
|
kevinz000
|
eb33901046
|
Merge pull request #11002 from BlackMajor/walkerbois
Makes the Ash Walker camp a static spawn in lavaland.
|
2020-02-15 11:47:58 -07:00 |
|
kevinz000
|
957c6168b6
|
Merge pull request #11006 from Ghommie/Ghommie-cit570
Something about a couple stack trace issues.
|
2020-02-15 11:47:30 -07:00 |
|
kevinz000
|
d2398f4584
|
Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
|
2020-02-15 11:45:39 -07:00 |
|
kevinz000
|
f6cf5adb4c
|
Update mech_fabricator.dm
|
2020-02-14 15:33:47 -07:00 |
|
kevinz000
|
d97b1d4e80
|
Update mech_fabricator.dm
|
2020-02-14 15:30:06 -07:00 |
|
Ghom
|
0a1c3bd084
|
Merge branch 'master' into Ghommie-cit539
|
2020-02-14 19:42:36 +01:00 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
Ghom
|
1e57664a99
|
Merge pull request #10934 from kevinz000/actual_ghost_newscasters
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
|
2020-02-14 19:21:48 +01:00 |
|
Ghom
|
e36a581889
|
Merge pull request #11065 from Citadel-Station-13/kevinz000-patch-17
removes bluespace dick compression
|
2020-02-14 19:21:11 +01:00 |
|
Ghom
|
b9ab0cebb3
|
Merge pull request #11051 from Citadel-Station-13/kevinz000-patch-2
nerfs hand teleporters to have a dispel delay
|
2020-02-14 19:17:59 +01:00 |
|
Ghom
|
fe332571fd
|
Merge pull request #11061 from Trilbyspaceclone/patch-285
Massive metal tower shields now are not transparent
|
2020-02-14 19:17:04 +01:00 |
|
Ghom
|
64882b8a90
|
Merge pull request #10993 from Linzolle/bows
adds the bow
|
2020-02-14 08:01:12 +01:00 |
|
Ghom
|
ef7347fc37
|
Merge pull request #11079 from Arturlang/patch-9
Makes valentine related antag datums convertable by bloodsuckers
|
2020-02-14 07:36:11 +01:00 |
|
Arturlang
|
cf980b52ac
|
Fuck valentines
|
2020-02-14 00:01:07 +02:00 |
|
Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
Ghom
|
071c3a143f
|
Update cards_ids.dm
|
2020-02-13 18:13:14 +01:00 |
|
Ghom
|
1628934b9f
|
Update cards_ids.dm
|
2020-02-13 18:00:12 +01:00 |
|
Ghom
|
121b37410a
|
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
|
2020-02-13 16:40:12 +01:00 |
|
Ghom
|
a4a9701c98
|
Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
|
2020-02-13 15:06:27 +01:00 |
|
kevinz000
|
4345f01322
|
Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
|
2020-02-13 04:11:01 -07:00 |
|
kevinz000
|
d74cfb7734
|
Update compressionkit.dm
|
2020-02-13 02:22:25 -07:00 |
|
Ghom
|
5730b717c5
|
Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
|
2020-02-13 09:41:10 +01:00 |
|
Ghom
|
b3a530abc9
|
Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
|
2020-02-13 09:40:22 +01:00 |
|
Ghom
|
bfdef7fcfd
|
Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
|
2020-02-13 09:39:07 +01:00 |
|
Winter Flare
|
ac55d1d25d
|
Merge branch 'master' into tinytweaks-2-9-20
|
2020-02-13 03:34:44 -05:00 |
|
Ghom
|
721b647e3c
|
Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
|
2020-02-13 09:28:35 +01:00 |
|
Trilbyspaceclone
|
aa12ec70a3
|
Update shields.dm
|
2020-02-13 03:02:26 -05:00 |
|
kevinz000
|
40111faab1
|
Update geiger_counter.dm
|
2020-02-13 00:12:25 -07:00 |
|
Seris02
|
4ac7fff7e3
|
ye
|
2020-02-13 13:37:47 +08:00 |
|
kevinz000
|
73e782a4de
|
Update teleportation.dm
|
2020-02-12 20:56:09 -07:00 |
|
kevinz000
|
aad78ffb78
|
Update teleportation.dm
|
2020-02-12 17:53:42 -07:00 |
|
Ghommie
|
62ff589840
|
Something about a couple runtimes.
|
2020-02-12 09:10:24 +01:00 |
|
ShadeAware
|
bbedf617f5
|
Declutters the Locker
|
2020-02-11 17:33:18 -05:00 |
|
kevinz000
|
9459212692
|
Update brigdoors.dm
|
2020-02-11 08:51:24 -07:00 |
|
kevinz000
|
cc0b815a5d
|
Update brigdoors.dm
|
2020-02-11 08:47:32 -07:00 |
|
kevinz000
|
275fb6fc41
|
auto profiler
|
2020-02-11 07:54:17 -07:00 |
|
Ghommie
|
0caabe8018
|
Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM.
|
2020-02-11 15:23:03 +01:00 |
|
Winter Flare
|
5549cd93f1
|
Merge branch 'master' into tinytweaks-2-9-20
|
2020-02-11 07:20:16 -05:00 |
|
Ghommie
|
c19549c7f9
|
Something about a couple stack trace issues.
|
2020-02-10 14:51:05 +01:00 |
|
kevinz000
|
276f4b5fae
|
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
|
2020-02-10 04:32:01 -07:00 |
|
kevinz000
|
32a5957c18
|
usr
|
2020-02-10 04:30:07 -07:00 |
|
kevinz000
|
690c14a716
|
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
|
2020-02-10 04:29:22 -07:00 |
|
kevinz000
|
01390fa0e0
|
Merge remote-tracking branch 'citadel/master' into attack_chain
|
2020-02-10 04:18:02 -07:00 |
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
kevinz000
|
5d2b2d7fbf
|
Merge pull request #10971 from Trilbyspaceclone/disco_baby
Adds more Alien disco
|
2020-02-10 04:14:18 -07:00 |
|