Putnam
|
61d0e3fed6
|
A minor thread optimization.
|
2021-05-26 06:13:50 -07:00 |
|
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 |
|
Putnam
|
62279e449e
|
Well, that works
|
2021-05-21 18:51:13 -07:00 |
|
Lin
|
67ea47998c
|
Merge pull request #14738 from Putnam3145/fix-activity-again
Makes antags actually get activity properly
|
2021-05-20 13:33:51 -05: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 |
|
Lin
|
0c77834c56
|
Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
|
2021-05-19 14:49:00 -05:00 |
|
silicons
|
d0bb22da5f
|
Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
|
2021-05-19 08:02:59 -06:00 |
|
Putnam
|
fc31453587
|
Makes antags actually get activity properly
|
2021-05-18 16:27:07 -07:00 |
|
silicons
|
28c0d2c3cf
|
Merge pull request #14730 from shellspeed1/plumbing-pod
Empty mining capsule pod for all those fun projects which need space.
|
2021-05-18 17:09:05 -06:00 |
|
silicons
|
898d1d2c7f
|
Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
|
2021-05-18 17:08:58 -06:00 |
|
silicons
|
58df45ee3f
|
Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
|
2021-05-18 16:44:35 -06:00 |
|
silicons
|
80bb2b235b
|
Merge pull request #14726 from zeroisthebiggay/carshalash
ports Amaretto from TG
|
2021-05-18 16:44:24 -06:00 |
|
qweq12yt
|
ba20b5b8aa
|
fix emag shuttle order
|
2021-05-17 18:48:01 -03:00 |
|
qweq12yt
|
9dd372ed11
|
fix void cloak going to the void
|
2021-05-17 17:33:23 -03:00 |
|
silicons
|
780a579c7b
|
Update SDQL_2_wrappers.dm
|
2021-05-17 12:20:15 -07:00 |
|
Timothy Teakettle
|
da7c1ddb0a
|
bold statement for someone who didnt test their code
|
2021-05-17 19:04:51 +01:00 |
|
WanderingFox95
|
57d22c6962
|
Typo
|
2021-05-17 12:36:12 +02:00 |
|
WanderingFox95
|
7cbe105061
|
Efink
|
2021-05-17 12:34:38 +02:00 |
|
WanderingFox95
|
499111edf8
|
Efink
|
2021-05-17 12:33:39 +02:00 |
|
WanderingFox95
|
a947ec1322
|
Recipes
|
2021-05-17 12:30:01 +02:00 |
|
Timothy Teakettle
|
6d13f09c3d
|
Update preferences.dm
|
2021-05-17 11:20:47 +01:00 |
|
Timothy Teakettle
|
4cb0eb3418
|
Update preferences.dm
|
2021-05-17 10:59:26 +01:00 |
|
shellspeed1
|
e4e5d8f5cd
|
adds an pod for projects
|
2021-05-17 00:59:10 -07:00 |
|
Timothy Teakettle
|
80d287abca
|
index magic moment
|
2021-05-16 03:10:35 +01:00 |
|
zeroisthebiggay
|
a0b83950ae
|
Update drinks_recipes.dm
|
2021-05-15 12:03:04 -04:00 |
|
zeroisthebiggay
|
03c2f752fa
|
Update drinks_recipes.dm
|
2021-05-15 11:51:43 -04:00 |
|
zeroisthebiggay
|
2bc5edede0
|
Update drinks_recipes.dm
|
2021-05-15 09:51:48 -04:00 |
|
zeroisthebiggay
|
8166167a45
|
Update drinks_recipes.dm
|
2021-05-15 09:44:21 -04:00 |
|
zeroisthebiggay
|
1ff27aa732
|
Update drinks_recipes.dm
|
2021-05-15 09:43:55 -04:00 |
|
zeroisthebiggay
|
90f9c3cb79
|
Update drinks_recipes.dm
|
2021-05-15 09:39:56 -04:00 |
|
zerothebigboy
|
37873d6750
|
gommit
|
2021-05-15 08:52:24 -04:00 |
|
silicons
|
4ffec1dafa
|
Update gateway.dm (#14711)
|
2021-05-14 17:50:27 +02:00 |
|
timothyteakettle
|
34869215e8
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-14 01:59:32 +01:00 |
|
Lin
|
d7f8136d5a
|
Merge pull request #14715 from keronshb/vogsleepgone
Removes Voice of God sleep again since an undocumented change readded it.
|
2021-05-13 17:50:14 -05:00 |
|
zeroisthebiggay
|
040bcb155a
|
Update uplink_stealth.dm
|
2021-05-13 05:03:09 -04:00 |
|
keronshb
|
6e3e075ff9
|
Oops forgot something
|
2021-05-12 13:14:54 -04:00 |
|
keronshb
|
fa067a481a
|
Removes VOG sleep command again
Undocumented change.
|
2021-05-12 13:09:39 -04: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 |
|
silicons
|
625488891e
|
Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
Lavaland Wine: Pinot Mort (Ready)
|
2021-05-12 04:43:11 -06:00 |
|
silicons
|
2d455e4da2
|
Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
|
2021-05-12 04:42:28 -06:00 |
|
silicons
|
c5f13c44a8
|
Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
|
2021-05-12 04:42:22 -06:00 |
|
silicons
|
3b1d66efc5
|
Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
bunny ears but they're not lops (vegas style)
|
2021-05-12 04:42:12 -06:00 |
|
Lin
|
82b6443928
|
Merge pull request #14700 from keronshb/skewerpain
What if failing to remove a brass skewer caused *pain?
|
2021-05-11 14:11:07 -05:00 |
|
Lin
|
0a883f3796
|
Merge pull request #14706 from DeltaFire15/heretic-bladeshatter-bug
Fixes heretic bladeshatters, also fixes find_safe_turf since those were related
|
2021-05-11 14:08:34 -05:00 |
|
Linzolle
|
4609d732f9
|
more spellcheck of anthropomorph
|
2021-05-10 17:15:43 -05:00 |
|
Lin
|
59914250c3
|
spellcheck
|
2021-05-10 17:04:48 -05:00 |
|
timothyteakettle
|
7560898f94
|
Update preferences.dm
|
2021-05-10 22:53:27 +01:00 |
|
Lin
|
19d6ff8371
|
Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
|
2021-05-10 14:29:48 -05:00 |
|
qweq12yt
|
3b234405c8
|
fixed disky comfort spam
|
2021-05-10 16:06:57 -03:00 |
|
qweq12yt
|
8c0911e968
|
fix hulks breaking cuffs/zipties
|
2021-05-10 15:56:50 -03:00 |
|