Commit Graph
15760 Commits
Author SHA1 Message Date
PKPenguin321andCitadelStationBot ddb6f7ebae Esword cig lighting messages fix (#37216)
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
2018-04-16 19:20:26 -05:00
deathride58andGitHub f98040513a Merge pull request #6383 from Citadel-Station-13/upstream-merge-37113
[MIRROR] Adds an period to point messages
2018-04-16 03:05:00 +00:00
LetterJayandGitHub b3f42dce0b Update __donator.dm 2018-04-15 21:56:02 -05:00
deathride58andGitHub ecc5ac9861 Merge pull request #6411 from Citadel-Station-13/upstream-merge-37055
[MIRROR] Sender of PDA messages is told when their message is sent
2018-04-16 02:51:36 +00:00
deathride58andGitHub 542178548c Merge pull request #6412 from Citadel-Station-13/upstream-merge-37156
[MIRROR] Stops silicons looping through world every login looking for flippin runes
2018-04-16 02:51:13 +00:00
deathride58andGitHub 28f8554614 Merge pull request #6413 from Citadel-Station-13/upstream-merge-37054
[MIRROR] Reorganised component controls
2018-04-16 02:50:50 +00:00
deathride58andGitHub 5d75dff818 Merge pull request #6415 from Citadel-Station-13/upstream-merge-37195
[MIRROR] Removes tinyfans from omega/delta tcomms
2018-04-16 02:50:31 +00:00
deathride58andGitHub 88362a3d76 Merge pull request #6416 from Citadel-Station-13/upstream-merge-37190
[MIRROR] [s] Fixes bluespace cookie centcom exploit
2018-04-16 02:50:13 +00:00
deathride58andGitHub c10a3e38e2 Merge pull request #6417 from Citadel-Station-13/upstream-merge-37217
[MIRROR] Stops ghosts from being able to start plasma fires
2018-04-16 02:49:57 +00:00
deathride58andGitHub 41af940981 Merge pull request #6418 from Citadel-Station-13/upstream-merge-37215
[MIRROR] fixes borgs being able to control the CentCom ferry
2018-04-16 02:49:38 +00:00
deathride58andGitHub 87079e1ddb Merge pull request #6420 from Citadel-Station-13/upstream-merge-37220
[MIRROR] Blacklists His Grace from the deep fryer
2018-04-16 02:49:19 +00:00
deathride58andGitHub 8749f88c87 Merge pull request #6421 from Citadel-Station-13/upstream-merge-37221
[MIRROR] Allows passive gates to be interacted with in unpowered areas
2018-04-16 02:49:00 +00:00
deathride58andGitHub 36d1cc932c Merge pull request #6422 from Citadel-Station-13/upstream-merge-37224
[MIRROR] Filters out duplicate trophies.
2018-04-16 02:48:28 +00:00
deathride58andGitHub 3da0703e1f Merge pull request #6423 from Citadel-Station-13/upstream-merge-37233
[MIRROR] Fixes BSA targetting offline GPS
2018-04-16 02:48:12 +00:00
deathride58andGitHub 8110227bc3 Update living.dm 2018-04-15 22:46:55 -04:00
CitadelStationBot 2bb9502fce Fixes BSA targetting offline GPS 2018-04-15 16:01:10 -05:00
vuonojenmustaturskaandCitadelStationBot fbfac8ff36 Merge pull request #37233 from KorPhaeron/gps3
Fixes BSA targetting offline GPS
2018-04-15 16:01:10 -05:00
CitadelStationBot 82627817db Filters out duplicate trophies. 2018-04-15 12:42:41 -05:00
AnturKandCitadelStationBot 15ac393773 Filters out duplicate trophies. 2018-04-15 12:42:41 -05:00
CitadelStationBot b473b3b454 Allows passive gates to be interacted with in unpowered areas 2018-04-15 12:41:28 -05:00
vuonojenmustaturskaandCitadelStationBot 472e7f7f61 Allows passive gates to be touched in unpowered areas 2018-04-15 12:41:28 -05:00
CitadelStationBot 59c63b0618 Blacklists His Grace from the deep fryer 2018-04-15 12:41:19 -05:00
vuonojenmustaturskaandCitadelStationBot 64def88314 blacklist his grace from being deep-fried 2018-04-15 12:41:19 -05:00
CitadelStationBot 107add66bb fixes borgs being able to control the CentCom ferry 2018-04-15 12:39:52 -05:00
vuonojenmustaturskaandCitadelStationBot afeae1e446 fixes borgs being able to send the ferry 2018-04-15 12:39:52 -05:00
CitadelStationBot 5f8f230dc2 Stops ghosts from being able to start plasma fires 2018-04-15 12:39:40 -05:00
vuonojenmustaturskaandCitadelStationBot da5812b07b Stops ghosts from being able to start plasma fires 2018-04-15 12:39:40 -05:00
CitadelStationBot a2bc799cb5 [s] Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00
vuonojenmustaturskaandCitadelStationBot fd521dbe1f Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00
CitadelStationBot 56b2ba7792 Removes tinyfans from omega/delta tcomms 2018-04-15 09:57:26 -05:00
Jordan BrownandCitadelStationBot 492a31d37c Merge pull request #37195 from 81Denton/remove-tinyfan-from-the-premises
Removes tinyfans from omega/delta tcomms
2018-04-15 09:57:25 -05:00
CitadelStationBot 17f1e5355c Reorganised component controls 2018-04-15 04:31:16 -05:00
John GinnaneandCitadelStationBot e67467b919 Reorganised component controls (#37054)
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
2018-04-15 04:31:16 -05:00
CitadelStationBot d7881dba46 Stops silicons looping through world every login looking for flippin runes 2018-04-14 21:47:49 -05:00
Jordan BrownandCitadelStationBot 78f89423fe Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38
Stops silicons looping through world every login looking for flippin runes
2018-04-14 21:47:49 -05:00
CitadelStationBot be1ab280ed Sender of PDA messages is told when their message is sent 2018-04-14 16:13:50 -05:00
John GinnaneandCitadelStationBot d63b549302 Sender of PDA messages is told when their message is sent (#37055)
* Adds "sent message" to the sender of PDA messages

* Added span to message
2018-04-14 16:13:50 -05:00
deathride58andGitHub 60a35c5270 Merge pull request #6409 from Citadel-Station-13/upstream-merge-37194
[MIRROR] Fixes SCP being deconstructable
2018-04-14 20:39:12 +00:00
deathride58andGitHub a3279d6de2 Merge pull request #6408 from Citadel-Station-13/upstream-merge-37095
[MIRROR] sucessfully fixes some grammar
2018-04-14 20:38:52 +00:00
deathride58andGitHub fc035e2b61 Merge pull request #6407 from Citadel-Station-13/upstream-merge-37176
[MIRROR] Removes startup message in sql log
2018-04-14 20:38:33 +00:00
deathride58andGitHub dae96ee19b Merge pull request #6406 from Citadel-Station-13/upstream-merge-37168
[MIRROR] Fixes imps all having the same name
2018-04-14 20:38:08 +00:00
deathride58andGitHub 6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417
[MIRROR] RPD pipe autowrenching
2018-04-14 20:37:42 +00:00
CitadelStationBot 19f4a5f990 Fixes SCP being deconstructable 2018-04-14 10:57:55 -05:00
vuonojenmustaturskaandCitadelStationBot 26fb305551 zoinks 2018-04-14 10:57:55 -05:00
CitadelStationBot 45054c24dc sucessfully fixes some grammar 2018-04-14 08:12:35 -05:00
TlaltecuhtliandCitadelStationBot 3ffe415eb8 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 08:12:34 -05:00
CitadelStationBot ae77b58bcb Removes startup message in sql log 2018-04-14 08:11:21 -05:00
JordieandCitadelStationBot 9ce8aae7dd removes startup message in sql log (#37176) 2018-04-14 08:11:20 -05:00
CitadelStationBot 0d0092497e Fixes imps all having the same name 2018-04-14 08:10:07 -05:00
shrimpboom8andCitadelStationBot 677f3e8a7b Fixes imps all having the same name (#37168)
* Update imp.dm

* Replaced 1 with TRUE
2018-04-14 08:10:07 -05:00