Commit Graph
31592 Commits
Author SHA1 Message Date
Ghommie 7578d60436 flavor texts unset on randomize, yay. 2020-03-10 15:11:16 +01:00
Ghommie 7ba120a8d3 lazyor 2020-03-10 14:12:11 +01:00
Ghommie 17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 2020-03-09 22:42:31 +01:00
Ghommie aa8dc93a5d locate textref. 2020-03-09 22:27:27 +01:00
Ghommie 0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
CitadelStationBot d0a58ce9fa Automatic changelog generation for PR #11371 [ci skip] 2020-03-09 11:07:48 -05:00
GhomandGitHub 29346f7827 Merge pull request #11371 from keronshb/BlobRefactor
Blob refactor + reroll ports
2020-03-09 17:07:45 +01:00
CitadelStationBot 126d80e1de Automatic changelog generation for PR #11382 [ci skip] 2020-03-09 10:50:36 -05:00
GhomandGitHub 503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit
tauric contractor space suits
2020-03-09 16:50:32 +01:00
CitadelStationBot 878947bf7e Automatic changelog generation for PR #11393 [ci skip] 2020-03-08 23:29:13 -05:00
kevinz000andGitHub 3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1
Webedit fixing bloodsucker mesmerize
2020-03-08 21:29:10 -07:00
keronshb 7e1e905a95 Line ending changes, I hope
here goes nothing.
2020-03-08 20:36:05 -04:00
keronshb 0d3da4fcc0 maybe? last go? 2
Should be the final part I hope
2020-03-08 20:11:13 -04:00
keronshb 94958581b9 maybe? last go?
maybe? last go?
2020-03-08 20:10:34 -04:00
keronshb fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
Pne more test go
2020-03-08 19:48:30 -04:00
CitadelStationBot 0d66a40e55 Automatic changelog generation for PR #11377 [ci skip] 2020-03-08 18:26:56 -05:00
GhomandGitHub 1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
CitadelStationBot c063558c6e Automatic changelog generation for PR #11317 [ci skip] 2020-03-08 18:26:08 -05:00
GhomandGitHub 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
keronshb 7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
Trying to fix this shit again
2020-03-08 19:17:28 -04:00
CitadelStationBot aa25547ce3 Automatic changelog generation for PR #11288 [ci skip] 2020-03-08 18:01:14 -05:00
GhomandGitHub 1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300
[ready] Craftable Prescription & Sunglasses HUDs
2020-03-09 00:01:12 +01:00
keronshb d460f5359e Hopefully this will fix it?
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
keronshb 9b63c7aa11 Trying to see if this will fix the line end issue
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
GhomandGitHub bceed5d002 Update recipes_clothing.dm 2020-03-08 23:46:33 +01:00
GhomandGitHub 187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
keronshb 0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
To fixs something?
2020-03-08 17:51:17 -04:00
kevinz000andGitHub 274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-03-08 11:10:30 -07:00
CitadelStationBot 70d302f10d Automatic changelog generation for PR #11372 [ci skip] 2020-03-08 13:10:04 -05:00
kevinz000andGitHub b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
2020-03-08 11:10:02 -07:00
kevinz000andGitHub 5add119388 Merge pull request #11374 from Detective-Google/AI-cryo
Adds a verb for AIs to cryo
2020-03-08 11:09:48 -07:00
kevinz000andGitHub 2b99f729e6 Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3
I forgot to delete a line on the (now working) PDA overlays fix.
2020-03-08 11:09:17 -07:00
CitadelStationBot a180d9c704 Automatic changelog generation for PR #11365 [ci skip] 2020-03-08 10:15:14 -05:00
kevinz000andGitHub 2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607
Makes monkey probability of gorillize from radiation exponential.
2020-03-08 08:15:11 -07:00
CitadelStationBot bc0d1bbe73 Automatic changelog generation for PR #11357 [ci skip] 2020-03-08 10:15:01 -05:00
kevinz000andGitHub 36f1e952b4 Merge pull request #11357 from Ghommie/Ghommie-cit606
Patches some awful integrated circuit examiner runtime errors.
2020-03-08 08:14:58 -07:00
GhomandGitHub 3c066aa771 Update pai_shell.dm 2020-03-08 15:46:38 +01:00
CitadelStationBot d78926b269 Automatic changelog generation for PR #11369 [ci skip] 2020-03-08 09:34:51 -05:00
kevinz000andGitHub c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609
Porting the musician and curator beacons.
2020-03-08 07:34:48 -07:00
GhomandGitHub 7ad2c6dce0 Update pai.dm 2020-03-08 14:55:15 +01:00
GhomandGitHub 8f6677326d Update pai.dm 2020-03-08 14:51:41 +01:00
GhomandGitHub a0e5f1651e Update pai_shell.dm 2020-03-08 14:49:43 +01:00
GhomandGitHub 4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
GhomandGitHub 57ba56d3bc Update handcuffs.dm 2020-03-08 14:09:59 +01:00
LinandGitHub ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1
Me 2048
2020-03-08 01:26:39 -06:00
CitadelStationBot d4e4f357d4 Automatic changelog generation for PR #11383 [ci skip] 2020-03-08 00:18:11 -06:00
GhomandGitHub 57db0e0320 Merge pull request #11383 from Putnam3145/fix-storyteller-weights
Gives storyteller weights defaults properly (whoops)
2020-03-08 07:18:09 +01:00
GhomandGitHub d25ec08da8 Update PDA.dm 2020-03-08 07:13:08 +01:00
Putnam dfa7637f1b fixes storyteller weights 2020-03-07 22:09:20 -08:00
CitadelStationBot ecba3d0ebe Automatic changelog generation for PR #11368 [ci skip] 2020-03-07 22:33:23 -06:00