 Putnam
|
e580c504fa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-05-21 18:52:16 -07:00 |
|
|
Lin
|
acb2177a85
|
Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
adds _contents() wrapper for SELECT SDQL2 statements
|
2021-05-19 14:50:18 -05:00 |
|
|
silicons
|
780a579c7b
|
Update SDQL_2_wrappers.dm
|
2021-05-17 12:20:15 -07:00 |
|
|
timothyteakettle
|
34869215e8
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-14 01:59:32 +01:00 |
|
|
silicons
|
5601badbff
|
deterministic explosion system (#13392)
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
|
2021-05-12 05:44:53 -05:00 |
|
|
Putnam
|
6c8fa56132
|
Adds make priority announcement verb
|
2021-05-06 15:10:36 -07:00 |
|
|
Timothy Teakettle
|
3c7137f951
|
what if we didnt break 90% of the game
|
2021-05-05 18:19:02 +01:00 |
|
|
Fabian
|
63d910c79c
|
Merge branch 'master' into the-fuck-am-i-doing
|
2021-05-05 17:26:41 +02:00 |
|
|
zerothebigboy
|
359c778955
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# code/modules/ninja/suit/ninjaDrainAct.dm
|
2021-05-02 22:47:39 -04:00 |
|
|
silicons
|
47489c21d6
|
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
|
2021-04-27 00:59:45 -07:00 |
|
|
SandPoot
|
90661d3687
|
upload files
|
2021-04-24 21:37:01 -03:00 |
|
|
SandPoot
|
5bb6078def
|
upload files
|
2021-04-22 20:39:21 -03:00 |
|
|
silicons
|
75e3f5eae6
|
Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
|
2021-04-21 13:50:46 -06:00 |
|
|
silicons
|
e8e625cb5c
|
Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
|
2021-04-18 18:49:27 -06:00 |
|
|
silicons
|
52a4a5a042
|
nothing to see here folks
|
2021-04-18 08:29:51 -07:00 |
|
|
silicons
|
9d4a9a6677
|
Update functions.dm
|
2021-04-17 16:22:13 -07:00 |
|
|
silicons
|
bb50a4f160
|
Update topic.dm
|
2021-04-17 16:21:33 -07:00 |
|
|
Putnam
|
4811216f07
|
Activity tracking; traitor class tweaks
|
2021-04-13 06:42:32 -07:00 |
|
|
silicons
|
cbd7e0de6a
|
Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
|
2021-04-06 04:10:00 -06:00 |
|
|
zerothebigboy
|
f1b45b3839
|
eatshitanddie
|
2021-04-05 21:55:17 -04:00 |
|
|
Blue Wildrose
|
3d8f8ffe27
|
Bringin' back the ding
|
2021-04-02 02:19:19 -07:00 |
|
|
zerothebigboy
|
01d92230a3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/mask.dmi
|
2021-03-16 19:19:12 -04:00 |
|
|
Fabian
|
7e50d878ca
|
Merge branch 'master' into the-fuck-am-i-doing
|
2021-03-15 14:09:30 +01:00 |
|
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
|
Putnam
|
cc360288bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-08 14:46:46 -08:00 |
|
|
Letter N
|
de6f1401bb
|
final fix
|
2021-03-08 13:24:28 +08:00 |
|
|
Fabian
|
8178b7073a
|
It's done, atleast the code is
|
2021-03-05 21:50:29 +01:00 |
|
|
Fabian
|
2f1aba4f80
|
Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
|
2021-03-05 21:19:59 +01:00 |
|
|
Fabian
|
a061f02b5b
|
Revert "objectives"
This reverts commit dbabbb1062.
|
2021-03-05 21:19:56 +01:00 |
|
|
Fabian
|
dbabbb1062
|
objectives
hrnrghghgh
|
2021-03-05 20:31:57 +01:00 |
|
|
Fabian
|
7f38564838
|
i can't believe kevin made me code
im taking severe offense to this
|
2021-03-05 19:55:53 +01:00 |
|
|
Letter N
|
34697acf74
|
missing icon fix & stop throwing out parts
|
2021-03-05 19:29:52 +08:00 |
|
|
Letter N
|
4f8d6c7c11
|
bruh
|
2021-03-05 17:21:22 +08:00 |
|
|
Letter N
|
e967590dfa
|
fix verb
|
2021-03-05 17:17:30 +08:00 |
|
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
|
Letter N
|
a87e4533e5
|
support for tgs4 noconfigs needed***
|
2021-03-03 17:33:14 +08:00 |
|
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
|
Putnam
|
f07a9c13fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-02 01:44:58 -08:00 |
|
|
zerothebigboy
|
165966ffeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
|
2021-02-28 22:13:00 -05:00 |
|
|
Letter N
|
c208f82abf
|
oops! all dumb cat
|
2021-02-27 09:15:39 +08:00 |
|
|
Letter N
|
5c39381117
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-23 11:36:05 +08:00 |
|
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
|
timothyteakettle
|
69e9a94829
|
prioritise clients
|
2021-02-21 00:18:25 +00:00 |
|
|
Letter N
|
6abad913ff
|
the sqel
|
2021-02-19 14:52:18 +08:00 |
|
|
Letter N
|
7d39949a2f
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-19 12:38:32 +08:00 |
|
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +08:00 |
|
|
Letter N
|
7b24456e2d
|
does not exist
|
2021-02-16 20:33:46 +08:00 |
|
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
|
Letter N
|
834e4730b3
|
not existing
|
2021-02-09 15:44:49 +08:00 |
|