Commit Graph

2110 Commits

Author SHA1 Message Date
SandPoot
6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07: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
timothyteakettle
8f0fbb75ac Update security.dm 2021-02-14 22:21:11 +00:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
Timothy Teakettle
09fdb5f83a Update apc_control.dm 2021-02-09 09:48:17 +00:00
silicons
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
DeltaFire
c417d576ec Merge pull request #14152 from Arturlang/turret_fixing_redo
Brings back turret fixing
2021-01-30 19:10:10 +01:00
Artur
f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02:00
Lin
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
Putnam3145
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
silicons
f3cdaf941b Update colormate.dm 2021-01-20 15:11:04 -07:00
silicons
db1693b906 Update colormate.dm 2021-01-17 20:39:00 -07:00
silicons
ffa56152d4 Update colormate.dm 2021-01-17 20:36:19 -07:00
silicons
1aae6a2154 Update colormate.dm 2021-01-17 20:35:08 -07:00
silicons
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
silicons
9fec00621e Update colormate.dm 2021-01-09 06:43:55 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
DeltaFire
d153d82441 Merge pull request #13931 from shellspeed1/porting-turret
Ports disposable sentry gun for station engineers as a traitor item from TG
2021-01-08 02:59:48 +01:00
MrJWhit
1cf951c4d4 Update atmos_control.dm 2021-01-06 02:38:37 -05:00
silicons
fbb2cfbba1 Update colormate.dm 2020-12-31 23:05:14 -07:00
silicons
f1205efa0f Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
2020-12-31 12:38:07 -07:00
shellspeed1
b69132bede ports https://github.com/tgstation/tgstation/pull/52931 2020-12-31 00:34:44 -08:00
Letter N
40f937c28b linter again 2020-12-29 13:56:50 +08:00
raspy-on-osu
2352580b41 init 2020-12-27 05:36:49 -05:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
raspy-on-osu
d3e224d9c1 init 2020-12-21 04:54:19 -05:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
ebd6e0cbec no backapck in backpack 2020-12-17 04:14:04 -07:00
SandPoot
3ea756a062 typo and remove badword 2020-12-16 11:43:40 -03:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
a7aa7f2466 delete pdas 2020-12-15 07:43:35 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
4451a96997 fixes 2020-12-13 20:12:14 -07:00
silicons
31beb2dd62 Update colormate.dm 2020-12-13 06:41:40 -07:00
silicons
28a0725bd8 Update colormate.dm 2020-12-13 06:36:20 -07:00
silicons
99709a1a35 fix 2020-12-13 04:30:00 -07:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00