Commit Graph

2408 Commits

Author SHA1 Message Date
Nadyr
09408105eb Merge pull request #2557 from CHOMPStationBot/upstream-merge-11090
[MIRROR] Return cloaks to 1 pt cost
2021-07-15 20:56:09 -04:00
Nadyr
b16aed9159 powder that makes you say yes 2021-07-15 20:24:02 -04:00
Nadyr
a0413ee291 Merge branch 'master' into upstream-merge-11090 2021-07-15 19:26:08 -04:00
Nadyr
1837f4a8ea Merge branch 'master' into upstream-merge-11054 2021-07-15 19:17:43 -04:00
Nadyr
b061a207ff powder that makes you say yes 2021-07-15 18:34:10 -04:00
Chompstation Bot
cad0fc0da1 Return cloaks to 1 pt cost 2021-07-15 19:04:39 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Chompstation Bot
ba071c9f07 Fixes #11052 2021-07-13 06:17:20 +00:00
Aronai Sieyes
7db9506281 Merge pull request #11033 from VOREStation/upstream-merge-8161
[MIRROR] Fixes inverted logic in staffwho
2021-07-12 14:43:07 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish
Adds nail polish.
2021-07-05 23:56:25 +00:00
Chompstation Bot
f32c5af649 Adds tgui-style input modals for text, message, and num 2021-07-04 04:24:41 +00:00
Nadyr
c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794
[MIRROR] Port various backpacks
2021-07-03 21:40:25 -04:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
1fc002c984 powder that makes you say yes 2021-07-03 16:44:25 -07:00
Chompstation Bot
06159fd31f Update character slot limits, load dialog 2021-07-03 20:43:58 +00:00
Nadyr
e5f3ca6219 powder that makes you say yes 2021-07-01 19:39:04 -04:00
Nadyr
6c09c744d6 powder that makes you say yes 2021-07-01 19:37:00 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Aronai Sieyes
df7385d8d3 Merge pull request #10784 from lm40/master
fix stealthmins on staffwho
2021-06-28 18:06:37 +00:00
Razgriz
4ce93fa001 Merge pull request #2281 from CHOMPStationBot/upstream-merge-10743
[MIRROR] Adds Mug with Text to loadout
2021-06-25 00:33:56 -07:00
Razgriz
93794b2148 Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-25 00:17:19 -07:00
Novacat
35177da700 Merge pull request #10743 from Heroman3003/M-U-G
Adds Mug with Text to loadout
2021-06-24 07:24:20 +00:00
Razgriz
c687ed18ef Update 01_basic.dm 2021-06-23 15:48:13 -07:00
Razgriz
d869885761 Merge pull request #2273 from CHOMPStationBot/upstream-merge-10733
[MIRROR] Add approved fluff item
2021-06-23 15:00:16 -07:00
Novacat
cc58b4c1de Merge pull request #10733 from Very-Soft/shine
Add approved fluff item
2021-06-22 23:24:24 +00:00
Novacat
59f3b310e6 Merge pull request #10732 from ResidentCody/Fluff-Item-Addition
Update loadout_fluffitems_vr.dm -- Adds an approved Fluff Item
2021-06-22 23:24:17 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Nadyr
3df03629cf powder that makes you say yes 2021-06-21 20:20:44 -04:00
Chompstation Bot
bfbac8fb66 [MIRROR] Code fixes + refactors who/staffwho 2021-06-21 02:58:56 +00:00
Chompstation Bot
b379b08551 Pandora029 fluff item 2021-06-20 17:40:00 +00:00
Nadyr
374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660
[MIRROR] ITV Merchandise (Talon Gear)
2021-06-19 21:25:44 -04:00
Nadyr
b3ccdb22a9 powder that makes you say yes 2021-06-19 21:00:46 -04:00
Nadyr
bfd8b22c39 powder that makes you say yes 2021-06-19 20:50:43 -04:00
Nadyr
761d76a43c powder that makes you say yes 2021-06-19 20:48:36 -04:00
Razgriz
540d32375d Merge pull request #2220 from CHOMPStationBot/upstream-merge-10662
[MIRROR] Port current /tg/ lighting system
2021-06-18 18:43:24 -07:00
radiantAurora
2c5bcd7b47 Merge pull request #1 from CHOMPStation2/master
update to master
2021-06-18 16:09:23 +01:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Verkister
274d1fa1d2 Earlyports synth var fix
Fixes synthetic var not getting cleared when loading character slots. Due to the char setup mannequin mob's nature of being a single same mob just getting its properties loaded from save slots, loading/making a synth character would permanently mess up the var for all non-synth chars on the roster and cause issues with synth-related settings because there was nothing in the code to clear the var.
2021-06-17 12:16:46 +03:00
radiantAurora
11f39e9dc4 Update setting_datums.dm 2021-06-10 17:38:35 +01:00
radiantAurora
9b28bc72b8 Add files via upload 2021-06-09 19:23:16 +01:00
radiantAurora
b0629849d7 Add files via upload 2021-06-09 19:22:39 +01:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix
Exploration Duffle Fix
2021-06-09 14:42:19 +00:00
Aronai Sieyes
394d5b148a Merge pull request #10562 from VOREStation/Arokha/fixprot
Fix mistake made in 04625a5
2021-06-06 05:24:33 +00:00
Aronai Sieyes
5c46d1bd45 Merge pull request #10537 from VOREStation/Fixes/10321
Fixes #10321
2021-06-02 16:02:54 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
c9f2771069 Merge pull request #2063 from CHOMPStationBot/upstream-merge-10452
[MIRROR] Fix language sani on relogins
2021-05-27 22:49:11 -04:00
Aronai Sieyes
6d37b26e57 Merge pull request #10452 from VOREStation/Arokha/langsani
Fix language sani on relogins
2021-05-28 00:47:56 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00