cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 13:48:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
25296 Commits
Author SHA1 Message Date
SandPootandGitHub 3f6733fc72 Ports tgstation/53371 (#60) 2020-09-03 16:43:42 -03:00
Enric Gabriel 05485c4b2c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-03 15:26:38 -03:00
Putnam 7dea04dca4 Wow, turns out negative*negative = positive, WHO KNEW. 2020-09-03 04:38:41 -07:00
deathride58 1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Putnam3145andGitHub bce53f71ce Merge pull request #13322 from timothyteakettle/fix-accents 
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
 2020-09-02 17:56:40 -07:00
Cameron!andGitHub e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
raspy-on-osu b186f8ac05 init 2020-09-02 20:26:43 -04:00
siliconsandGitHub cbcacaa0af Update magweapon.dm 2020-09-02 15:51:28 -07:00
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
Enric Gabriel fd6553faf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-02 14:35:57 -03:00
Ghommie a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
Putnam 7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
GrayRachnid a7a8bb7992 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch 2020-09-01 23:57:06 -04:00
Putnam3145andGitHub c0b73f8d6a Merge pull request #13306 from Citadel-Station-13/silicons-patch-28 
new codebase policy do not use potentially volatile procs in character setup of all places so we can stop having the moments when everyone's characters get bricked for the 619634'th time.
 2020-09-01 15:37:34 -07:00
Putnam b7a7170f7c Actually I ain't using it so it goes away. 2020-09-01 15:32:22 -07:00
Enric Gabriel ec8c53071c removes this port as cit has their own now. 2020-09-01 13:31:55 -03:00
Enric Gabriel d04a499179 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-01 11:40:44 -03:00
lolman360 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
siliconsandGitHub aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
siliconsandGitHub 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2 
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
 2020-08-31 21:21:46 -07:00
siliconsandGitHub 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam 
pyro anomaly spam salt pr (offer_control now supports ignore_category)
 2020-08-31 21:21:09 -07:00
siliconsandGitHub 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test 
Adds a character saving unit test
 2020-08-31 21:20:48 -07:00
siliconsandGitHub db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display 
Makes fusion analyze not assume we're still on fusion v5
 2020-08-31 21:20:15 -07:00
siliconsandGitHub 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref 
pref for hiding your ckey from roundend report
 2020-08-31 21:19:37 -07:00
siliconsandGitHub 1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix 
Makes plastitanium rapier not silently poison for pacifists.
 2020-08-31 21:19:09 -07:00
Putnam 735809a69b Commented out threaded FFI. 2020-08-31 20:11:52 -07:00
Putnam 2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
lolman360 1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360 4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360 400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
Enric Gabriel c4bb4e5873 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-31 21:23:27 -03:00
siliconsandGitHub 4936829bac Merge pull request #13319 from BlueWildrose/hungryhungryslimes 
Fixed newly created slimes being hungry
 2020-08-31 16:59:58 -07:00
Timothy Teakettle d859d12b9f yes 2020-09-01 00:14:17 +01:00
silicons ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Putnam c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Enric Gabriel 2d85d5f9d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 17:24:58 -03:00
siliconsandGitHub 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix 
Added health exemption to a couple events that need it.
 2020-08-30 13:15:10 -07:00
Timothy Teakettle 34393a187b fix ipcs 2020-08-30 16:27:09 +01:00
Putnam 6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam 10586f3c3b trend, trend! 2020-08-30 07:33:17 -07:00
Enric Gabriel 9de5d19c24 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 11:07:30 -03:00
Putnam 4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
Putnam 9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00