75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
dc08550162
push
2024-08-25 04:38:03 -03:00
4c25ac80a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-16 18:25:10 -03:00
e57c803e3a
Fix invalid box overlays
2024-04-16 02:19:36 -04:00
2e2528ee56
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-13 00:36:29 -03:00
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
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
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
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
4797a49914
Update files
2023-10-13 16:40:45 -03:00
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
b4f886d999
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
2022-09-18 20:55:22 -07:00
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03:00
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
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
c8df97474b
Adds pick-up, drop and throw sounds for items. ( #240 )
2022-04-01 15:57:30 -03:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
186b552103
merge
2021-10-29 21:50:58 -07:00
30134a0d2f
cool
2021-09-01 06:32:33 -04:00
0e95e1a8ad
cool
2021-09-01 05:14:17 -04:00
8a0c932d55
oops! All Refactors!
2021-02-12 11:07:58 +08:00
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
c1592ad162
more rewards
2020-07-11 23:27:29 +01:00
2229db2214
Merge branch 'master' into embed-changes
2020-06-17 16:40:34 +01:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
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
88d86e53d0
Porting some radial menu updates, and that one clown mask.
2020-05-09 00:45:48 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
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
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
25b1b889dc
amazing truely amazing
2020-04-19 19:09:20 -04:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
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
7bed0d5c87
Of runtimes and null.
2020-03-07 01:57:15 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
ab4aa29576
clown ops infiltrator consistency.
2020-02-01 00:02:31 +01:00
SandPoot