Commit Graph

99 Commits

Author SHA1 Message Date
Metis
3679a0eb1d more tweaks 2024-09-17 18:48:48 -04:00
SandPoot
dc08550162 push 2024-08-25 04:38:03 -03:00
Elizabeth Lavenza
e57c803e3a Fix invalid box overlays 2024-04-16 02:19:36 -04:00
deathride58
dd8c641520 Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
2024-04-12 23:31:54 -04:00
SandPoot
dfe90dfb61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486 2024-04-12 20:48:41 -03:00
SandPoot
ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot
4797a49914 Update files 2023-10-13 16:40:45 -03:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
zerothebigboy
30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy
0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
TrilbySpaceClone
25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Timothy Teakettle
62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590)
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
2020-03-24 20:39:46 +01:00
Ghommie
7bed0d5c87 Of runtimes and null. 2020-03-07 01:57:15 +01:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Seris02
40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Winter Flare
8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare
b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Ghommie
efcf79aab0 teachin' 🅱️ how to swim 2019-11-28 02:32:43 +01:00
Ghommie
13b9158a44 Ports "Plasmamen get plasma in their box" 2019-11-28 02:30:03 +01:00