silicons
|
2bf9c9d21f
|
Merge pull request #14678 from SandPoot/fancy-gateway
Ports #55624 from tgstation
|
2021-05-03 21:07:03 -06:00 |
|
timothyteakettle
|
7265c7111c
|
new limb covering var for markings
|
2021-05-03 22:47:22 +01:00 |
|
timothyteakettle
|
fac2b259ac
|
big changes 2
|
2021-05-03 22:43:45 +01:00 |
|
timothyteakettle
|
f4bb5255ab
|
Revert "big changes"
This reverts commit 7ac50b7ba2.
|
2021-05-03 22:43:32 +01:00 |
|
timothyteakettle
|
7ac50b7ba2
|
big changes
|
2021-05-03 22:43:22 +01:00 |
|
keronshb
|
834ec62c0b
|
Nightmare Jaunt Change
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
|
2021-05-03 00:05:39 -04:00 |
|
zerothebigboy
|
5b973d6ef4
|
..........
|
2021-05-02 23:36:17 -04: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 |
|
SandPoot
|
8f3a44f44a
|
fancy gateway
|
2021-05-02 18:57:04 -03:00 |
|
Timothy Teakettle
|
93254f5d9c
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-02 22:20:57 +01:00 |
|
Timothy Teakettle
|
d32770a0fa
|
test
|
2021-05-02 22:19:41 +01:00 |
|
Timothy Teakettle
|
2daed9250f
|
some bugfixes
|
2021-05-02 18:30:35 +01:00 |
|
Bapldap
|
aefa9eb292
|
lesspopcrates
less population required for surplus crates, everyone loves them. I don't see how this could affect gameplay in any negative way :)
|
2021-05-01 22:31:24 -05:00 |
|
silicons
|
1f06ac1b42
|
ohno
|
2021-05-01 18:18:21 -07:00 |
|
Timothy Teakettle
|
7efadade15
|
href fix
|
2021-05-01 20:55:13 +01:00 |
|
Timothy Teakettle
|
8aed1b4236
|
more color code
|
2021-05-01 20:37:22 +01:00 |
|
Timothy Teakettle
|
ddc3e3b3b2
|
Update preferences.dm
|
2021-05-15 21:24:20 +01:00 |
|
The0bserver
|
f1109c4f67
|
what a crate day (initial commit)
|
2021-05-01 02:15:07 -04:00 |
|
Timothy Teakettle
|
ac504d679b
|
digi humans
|
2021-04-30 14:07:44 +01:00 |
|
Lin
|
c80c974b6c
|
Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
|
2021-04-29 22:24:00 -05:00 |
|
WanderingFox95
|
25fc57cbef
|
Merge branch 'master' into WanderingFox95-LavalandWine
|
2021-04-29 10:54:18 +02:00 |
|
WanderingFox95
|
3ea98d3096
|
Merge branch 'master' into WanderingFox95-TheUnrollingPin
|
2021-04-29 10:54:00 +02:00 |
|
silicons
|
4289b8be1e
|
Merge remote-tracking branch 'citadel/master' into backend_sync
|
2021-04-28 22:34:17 -07:00 |
|
silicons
|
7cc6bba5ff
|
fixes
|
2021-04-28 22:27:09 -07:00 |
|
silicons
|
80a8467e9e
|
hm
|
2021-04-28 22:24:49 -07:00 |
|
silicons
|
e3755fba92
|
Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
|
2021-04-28 21:20:57 -06:00 |
|
silicons
|
986aef27b2
|
Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
|
2021-04-28 21:20:24 -06:00 |
|
silicons
|
cb0574a560
|
Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
|
2021-04-28 21:17:55 -06:00 |
|
silicons
|
d4529b1bf3
|
Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
|
2021-04-28 21:17:36 -06:00 |
|
silicons
|
17d7c4dd9a
|
Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
|
2021-04-28 21:17:15 -06:00 |
|
silicons
|
9bef72f205
|
Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
|
2021-04-28 21:17:06 -06:00 |
|
silicons
|
86bdb2455d
|
Merge pull request #14636 from TheObserver-sys/CrateDeal
Inconsistency Fixes, 10MM Rifle tweaks.
|
2021-04-28 21:16:58 -06:00 |
|
silicons
|
fefb33454f
|
do that too
|
2021-04-28 16:16:55 -07:00 |
|
Timothy Teakettle
|
cb98cbd19f
|
colour backend
|
2021-04-28 22:33:05 +01:00 |
|
qweq12yt
|
3afb801036
|
huh
|
2021-04-28 15:41:20 -03:00 |
|
Timothy Teakettle
|
72a009dc7c
|
based?
|
2021-04-28 19:31:20 +01:00 |
|
timothyteakettle
|
2f5cb63994
|
who deleted this
|
2021-04-28 17:37:09 +01:00 |
|
timothyteakettle
|
79b73a53a0
|
working buttons probably
|
2021-04-28 16:53:12 +01:00 |
|
silicons
|
47489c21d6
|
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
|
2021-04-27 00:59:45 -07:00 |
|
silicons
|
d547aa7ff1
|
almost compiling
|
2021-04-26 23:37:26 -07:00 |
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
silicons
|
a415453540
|
ripping off my own code
|
2021-04-26 23:29:37 -07:00 |
|
silicons
|
eb2c12ceee
|
yell wip
|
2021-04-26 23:10:10 -07:00 |
|
silicons
|
8fe45263c5
|
whew
|
2021-04-26 22:58:30 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
Timothy Teakettle
|
06e003f49b
|
functionality
|
2021-04-26 21:58:12 +01:00 |
|
silicons
|
03fa382f36
|
Update autobunker.dm
|
2021-04-26 13:57:34 -07:00 |
|
Timothy Teakettle
|
ca3ef3b0f3
|
X button
|
2021-04-26 18:02:47 +01:00 |
|
WanderingFox95
|
b252773e76
|
Annoying
|
2021-04-26 19:00:41 +02:00 |
|
WanderingFox95
|
8d8f1173ab
|
Adds the unflattening functionality
|
2021-04-26 18:44:02 +02:00 |
|