 Letter N
|
a43309a097
|
shuttle pog
|
2021-03-05 22:26:55 +08:00 |
|
|
Putnam
|
2137818d76
|
Massively reduced max-size minesweeper
|
2021-03-03 18:42:35 -08:00 |
|
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
|
Putnam
|
f07a9c13fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-02 01:44:58 -08:00 |
|
|
zerothebigboy
|
165966ffeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
|
2021-02-28 22:13:00 -05:00 |
|
|
Letter N
|
c5e8d8131e
|
you're going on the tabl
|
2021-02-27 17:47:22 +08:00 |
|
|
LinandGitHub
|
bc8b253837
|
Merge pull request #14303 from DeltaFire15/wiring-skillgain
Adds state check callbacks to machine frame tool use
|
2021-02-25 18:03:00 -06:00 |
|
|
DeltaFire
|
60708b03df
|
check
|
2021-02-24 05:16:15 +01:00 |
|
|
SandPoot
|
6c5acc3b4d
|
upload files
|
2021-02-23 16:42:07 -03:00 |
|
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
|
Letter N
|
2be4c76add
|
THIS FIXES IT (well it should :) )
|
2021-02-22 21:05:07 +08:00 |
|
|
siliconsandGitHub
|
841bb2aac2
|
Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
|
2021-02-21 14:48:50 -07:00 |
|
|
Letter N
|
7c0a63f729
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-21 09:57:22 +08:00 |
|
|
zerothebigboy
|
d0beec1364
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
|
2021-02-19 09:07:27 -05:00 |
|
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
|
SandPoot
|
2e29f30fdf
|
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
|
2021-02-18 15:04:22 -03:00 |
|
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
|
SmArtKar
|
756be084bc
|
Decks are saveable!
|
2021-02-17 18:50:23 +03:00 |
|
|
Letter N
|
3f40e353aa
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-16 19:41:53 +08:00 |
|
|
timothyteakettle
|
8f0fbb75ac
|
Update security.dm
|
2021-02-14 22:21:11 +00:00 |
|
|
Letter N
|
78ef87b012
|
minor fixes, compile but still bugged
|
2021-02-14 17:08:16 +08:00 |
|
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
|
Letter N
|
6286d40082
|
code works
|
2021-02-12 17:26:08 +08:00 |
|
|
Letter N
|
a2419f760a
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-12 13:18:09 +08:00 |
|
|
Letter N
|
3167dd8e22
|
atmos cc, cpl
|
2021-02-12 11:50:39 +08:00 |
|
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
|
SandPoot
|
a0c92f0646
|
upload files
|
2021-02-11 13:22:37 -03:00 |
|
|
zerothebigboy
|
058369a56d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
|
2021-02-10 12:55:45 -05:00 |
|
|
Timothy Teakettle
|
09fdb5f83a
|
Update apc_control.dm
|
2021-02-09 09:48:17 +00:00 |
|
|
Letter N
|
834e4730b3
|
not existing
|
2021-02-09 15:44:49 +08:00 |
|
|
zerothebigboy
|
85886f563f
|
f
|
2021-02-08 16:59:54 -05:00 |
|
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
|
siliconsandGitHub
|
d4f978c6db
|
Merge pull request #14172 from keronshb/cell-charger-upgrade
Cell Charger Buffs
|
2021-02-04 12:50:30 -07:00 |
|
|
keronshb
|
10c0e40d71
|
Removes extra update icon
Removes extra update icon
|
2021-01-30 14:40:11 -05:00 |
|
|
keronshb
|
f85accc406
|
Upgrades cell chargers
Similar to weapon cell chargers
|
2021-01-30 13:26:45 -05:00 |
|
|
DeltaFireandGitHub
|
c417d576ec
|
Merge pull request #14152 from Arturlang/turret_fixing_redo
Brings back turret fixing
|
2021-01-30 19:10:10 +01:00 |
|
|
Putnam
|
6faf6af961
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-29 16:31:01 -08:00 |
|
|
Artur
|
f2343b32fe
|
Brings back turret fixing
|
2021-01-28 09:39:21 +02:00 |
|
|
LinandGitHub
|
b1b5adb90d
|
Merge pull request #14086 from Citadel-Station-13/silicons-patch-25
officially adds the functionality to insert holdable mobs into colormate
|
2021-01-27 17:18:29 -06:00 |
|
|
Putnam3145andGitHub
|
2765aed0b4
|
Merge pull request #14085 from Citadel-Station-13/silicons-patch-24
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
|
2021-01-26 22:24:57 -08:00 |
|
|
siliconsandGitHub
|
f3cdaf941b
|
Update colormate.dm
|
2021-01-20 15:11:04 -07:00 |
|
|
Putnam
|
158dd11d8d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-19 17:52:40 -08:00 |
|
|
Putnam
|
f05df1c7de
|
Huge optimizations+some fixes
|
2021-01-19 17:48:20 -08:00 |
|
|
siliconsandGitHub
|
db1693b906
|
Update colormate.dm
|
2021-01-17 20:39:00 -07:00 |
|
|
siliconsandGitHub
|
ffa56152d4
|
Update colormate.dm
|
2021-01-17 20:36:19 -07:00 |
|
|
siliconsandGitHub
|
1aae6a2154
|
Update colormate.dm
|
2021-01-17 20:35:08 -07:00 |
|
|
siliconsandGitHub
|
9e52451df8
|
Update colormate.dm
|
2021-01-17 20:26:52 -07:00 |
|
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
|
siliconsandGitHub
|
9fec00621e
|
Update colormate.dm
|
2021-01-09 06:43:55 -07:00 |
|