41e5034005
i forgot about this component. Lavaland should have sounds now
2021-11-22 14:18:46 +08:00
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
50c7d4914f
reebe loading (woo)
2021-11-14 22:25:39 +01:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
186b552103
merge
2021-10-29 21:50:58 -07:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
06771cd47a
Merge pull request #15189 from zeroisthebiggay/minkraft
...
a new maintenance ambience
2021-09-28 00:15:16 -07:00
eb548eb9b3
Fixes antag prefs breaking
2021-09-27 20:03:42 -04:00
931ffd428f
Update sound.dm
2021-09-20 23:10:08 -04:00
baf4b90e0c
lmao i love coding
2021-09-20 22:58:39 -04:00
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
13323d2597
Merge branch 'master' into dynamicport
2021-09-19 17:59:09 -04:00
6cc4e35b44
Mob lists
2021-09-19 13:28:41 -04:00
0b7e514739
t
2021-09-19 14:05:28 +08:00
849dbc7fb3
sigh
2021-09-18 19:37:24 -07:00
f3550fd87c
blacklists morphine from dart guns, also haloperidol ( #15152 )
...
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* yeag
* actually adds the blacklist
can't you feel my heart beat so, i can't let you go, want you in my life
* changes
* Update html/changelog.html
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com >
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com >
2021-09-17 12:54:02 +02:00
792dc073b3
Final fixes?
2021-09-16 13:28:34 -04:00
4eaeccf8d8
Fixes more errors
2021-09-15 15:25:26 -04:00
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
abbd3d7708
Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right
...
Mafia updates
2021-09-13 15:08:50 -07:00
99908e17c5
Revert "Reworks supermatter gas output to be less cascade-y, more risky"
2021-09-13 11:39:32 -07:00
e342145663
Merge pull request #15070 from zeroisthebiggay/prisoners
...
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
4f0d5e8c9a
Merge pull request #15112 from Putnam3145/fix-supermatter-cascade
...
Reworks supermatter gas output to be less cascade-y, more risky
2021-09-12 20:58:48 -07:00
aa7a376dd5
removes DoT
2021-09-12 20:10:01 -07:00
791da1b9b4
mafia update.
2021-09-11 11:38:15 +08:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
fd785c6abf
Merge pull request #15063 from zeroisthebiggay/intern
...
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
cc2471cf7f
Reworked supermatter gas output
...
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
2021-09-09 13:51:22 -07:00
5a8a069cd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
2021-09-09 04:49:30 -04:00
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
c25dc84da0
what the cat doing with the yarn dependencies??
2021-09-08 09:25:38 +08:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
9f4f099880
gommit
2021-09-02 03:05:23 -04:00
d427c43b7b
Merge pull request #15032 from keronshb/itemhighlight
...
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
13130b3ee6
Merge pull request #15015 from keronshb/gremlinport
...
Gremlin Port
2021-08-26 21:40:59 -07:00
841ff4f81c
Merge pull request #15011 from Putnam3145/lavaland-random-atmos
...
Port of randomized planet atmos
2021-08-26 21:39:23 -07:00
e7b6c9ab5e
Catwalk Flooring
2021-08-22 22:41:48 -04:00
7070a848b6
Item Highlight Port
2021-08-22 00:21:06 -04:00
1b43c5b1ae
Merge remote-tracking branch 'upstream/master' into gremlinport
2021-08-17 09:03:09 -04:00
74595b2845
Update loadout.dm
2021-08-16 18:01:54 +01:00
45aed7a218
Gremlins
2021-08-15 23:48:24 -04:00
ff52c241f4
Procedural planet atmos
2021-08-14 21:13:45 -07:00
c37f2ca739
Merge pull request #14961 from Putnam3145/supermatter-auxgm
...
Makes supermatter properties auxgm-based
2021-08-11 02:01:05 -07:00
LetterN