silicons
|
dec84af233
|
Merge pull request #12830 from Funce/genetic-spider-fix
Fixes genewebs being impossibly impassable
|
2020-07-20 10:49:10 -07:00 |
|
Funce
|
0c07faa3e0
|
For future reference, '.' return overrides 'return' statements
|
2020-07-20 12:22:18 +12:00 |
|
Funce
|
2af449a3c7
|
Fixes genewebs being impossibly impassable
|
2020-07-20 11:55:23 +12:00 |
|
BlackMajor
|
f265b85d3b
|
Merge pull request #12810 from lolman360/master
service borg fix/tweak
|
2020-07-20 11:42:59 +12:00 |
|
Lin
|
b47872c079
|
Merge pull request #12802 from Citadel-Station-13/silicons-patch-31
fixes eshields not reflecting while active blocking uh oh
|
2020-07-19 11:12:32 -05:00 |
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
lolman360
|
f696a461af
|
Update RSF.dm
|
2020-07-18 16:10:25 +10:00 |
|
lolman360
|
0e38e1ff39
|
e
|
2020-07-18 16:03:32 +10:00 |
|
silicons
|
044525519a
|
Merge pull request #12750 from timothyteakettle/loadout-plushies
replaces plushies in the loadout menu with a choice box
|
2020-07-17 17:10:14 -07:00 |
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
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
|
813fd9b3e0
|
Update shields.dm
|
2020-07-17 09:00:02 -07:00 |
|
BlackMajor
|
9b671b7dd1
|
I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list
|
2020-07-18 03:08:52 +12:00 |
|
BlackMajor
|
eb9b3da581
|
Blacklist logic fix
|
2020-07-17 16:13:18 +12:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39: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 |
|
BlackMajor
|
fc909cd7c6
|
Added material sheets and tiles. This took more work than you'd think.
|
2020-07-17 01:17:54 +12: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 |
|
BlackMajor
|
06a4e57de9
|
changing this just means they can pick up jetpacks
|
2020-07-16 02:11:38 +12:00 |
|
BlackMajor
|
bd7c9d11d3
|
oh no
|
2020-07-16 02:02:29 +12: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 |
|
Arturlang
|
75eb276c98
|
Merge branch 'master' into TGUI-3.0
|
2020-07-14 16:17:23 +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 |
|
Timothy Teakettle
|
75c962ef7b
|
handle removal
|
2020-07-12 20:18:49 +01:00 |
|
Timothy Teakettle
|
c3d490a803
|
very cool
|
2020-07-12 20:15:57 +01: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 |
|
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
|
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 |
|
silicons
|
6d1ca993f6
|
Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
|
2020-07-08 03:10:44 -07:00 |
|