silicons
|
3d5c77f62b
|
Merge pull request #12779 from b1tt3r1n0/circlegame
Circle Game, Updated
|
2020-07-17 17:08:06 -07:00 |
|
silicons
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
Timothy Teakettle
|
0184739005
|
undo the woopsy
|
2020-07-15 19:53:37 +01:00 |
|
silicons
|
6121cbd091
|
Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
|
2020-07-15 08:50:20 -07:00 |
|
b1tt3r1n0
|
d678806143
|
Circle Game, Updated
Title
|
2020-07-14 23:40:09 -04:00 |
|
Timothy Teakettle
|
0a4a0fadb3
|
snails
|
2020-07-14 20:59:25 +01:00 |
|
Artur
|
57e0cafb15
|
Fixes clockwork sleepers
|
2020-07-14 20:01:04 +03:00 |
|
Artur
|
8af78d1189
|
Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0
|
2020-07-14 18:10:29 +03:00 |
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
Arturlang
|
75eb276c98
|
Merge branch 'master' into TGUI-3.0
|
2020-07-14 16:17:23 +03:00 |
|
Artur
|
c964cadd85
|
Makes amber alert work
|
2020-07-14 16:15:32 +03:00 |
|
Timothy Teakettle
|
8de062adbb
|
fix
|
2020-07-13 19:46:51 +01:00 |
|
Lin
|
2be790e8d7
|
Merge pull request #12736 from Citadel-Station-13/silicons-patch-21
hey let's not have 25% micro borgs going around killing people
|
2020-07-13 11:51:10 -05:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
silicons
|
f99a0564de
|
Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
|
2020-07-11 21:28:12 -07:00 |
|
timothyteakettle
|
3e5f981825
|
speed 4 for embeds
|
2020-07-12 03:17:50 +01:00 |
|
timothyteakettle
|
fbb9fe2d9c
|
better fork
|
2020-07-12 02:14:50 +01:00 |
|
timothyteakettle
|
cff2e3d680
|
never set max amount to 0
|
2020-07-12 00:58:34 +01:00 |
|
timothyteakettle
|
8712dd6de4
|
bugfixes
|
2020-07-12 00:31:45 +01:00 |
|
Timothy Teakettle
|
c1592ad162
|
more rewards
|
2020-07-11 23:27:29 +01:00 |
|
silicons
|
62df48b2f0
|
Update robot_upgrades.dm
|
2020-07-11 15:11:53 -07:00 |
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
Lin
|
e87653f781
|
Merge pull request #12594 from Citadel-Station-13/silicons-patch-3
what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
|
2020-07-11 16:00:39 -05:00 |
|
silicons
|
00867c064c
|
Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
|
2020-07-11 00:49:15 -07:00 |
|
silicons
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07:00 |
|
silicons
|
31da81aff4
|
Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
|
2020-07-09 20:37:18 -07:00 |
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
Putnam
|
9b955e5d03
|
gotta replace all of them actually
|
2020-07-09 03:19:52 -07:00 |
|
silicons
|
26d384e65b
|
fix
|
2020-07-09 03:17:17 -07:00 |
|
Putnam
|
2a04ab19fd
|
windoors :b:roke
|
2020-07-09 01:36:57 -07:00 |
|
Putnam
|
75c0b01c86
|
Updated to july 2020.
|
2020-07-08 23:13:26 -07:00 |
|
silicons
|
9828d6fe85
|
Merge pull request #12700 from KeRSedChaplain/POSTRATVAR
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
|
2020-07-08 22:51:36 -07:00 |
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
HeroWithYay
|
bed6f4ac91
|
Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
|
2020-07-09 16:32:14 +12:00 |
|
Artur
|
0a9dc33ce1
|
Reverts cloning changes
|
2020-07-08 23:42:47 +03:00 |
|
silicons
|
6d1ca993f6
|
Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
|
2020-07-08 03:10:44 -07:00 |
|
Timothy Teakettle
|
f0935a784d
|
two missing traits woops
|
2020-07-07 23:24:25 +01:00 |
|
Timothy Teakettle
|
e07909ebe2
|
does it in a far superior way
|
2020-07-07 23:12:36 +01:00 |
|
Lin
|
33f56fd168
|
Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
|
2020-07-07 13:23:25 -05:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
timothyteakettle
|
ab5795b3d3
|
Update pet_carrier.dm
|
2020-07-07 03:03:09 +01:00 |
|
DeltaFire
|
eeadc9a0e7
|
fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
|
2020-07-06 23:00:36 +02:00 |
|
Ghommie
|
afb5b5237c
|
linter & stuff.
|
2020-07-06 22:42:32 +02:00 |
|
Keate Senior
|
4ee72305d0
|
Post This Justiciar
sprites and object
|
2020-07-06 06:34:38 -04:00 |
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
Winter Flare
|
767290d8e9
|
Trashbag Whitelist Update
Trashbag can now hold:
All Organs
Most Shoes
Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
|
2020-07-04 21:03:31 -04:00 |
|