shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,737 Commits 5 Branches 0 Tags
41af9409817c1c3de8ebbf023462396d7933a5cc
Commit Graph

15737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
CitadelStationBot
2bb9502fce Fixes BSA targetting offline GPS 2018-04-15 16:01:10 -05:00
vuonojenmustaturska
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
AnturK
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
vuonojenmustaturska
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
vuonojenmustaturska
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
vuonojenmustaturska
afeae1e446 fixes borgs being able to send the ferry 2018-04-15 12:39:52 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
vuonojenmustaturska
26fb305551 zoinks 2018-04-14 10:57:55 -05:00
CitadelStationBot
45054c24dc sucessfully fixes some grammar 2018-04-14 08:12:35 -05:00
Tlaltecuhtli
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
Jordie
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
shrimpboom8
677f3e8a7b Fixes imps all having the same name (#37168) 
* Update imp.dm

* Replaced 1 with TRUE
 2018-04-14 08:10:07 -05:00
LetterJay
8b2a75c108 Merge pull request #6380 from Citadel-Station-13/upstream-merge-37005 
[MIRROR] Changes ore-burning math to avoid decimals (and raise RNG)
 2018-04-14 07:46:20 -05:00
LetterJay
a861726664 Merge pull request #6379 from Citadel-Station-13/upstream-merge-37125 
[MIRROR] Shuttle window spawner name fix
 2018-04-14 07:46:04 -05:00
LetterJay
385c9d9b22 Merge pull request #6382 from Citadel-Station-13/upstream-merge-37119 
[MIRROR] floor is lava no longer hurts silicons
 2018-04-14 07:45:42 -05:00
LetterJay
6b3a59b028 Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117 
[MIRROR] Removes some duplicated code
 2018-04-14 07:45:15 -05:00
LetterJay
86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122 
[MIRROR] Fixes interaction AI stuff
 2018-04-14 07:44:50 -05:00
LetterJay
fbaa2d5ae8 Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132 
[MIRROR] Fixes brain dna
 2018-04-14 07:44:36 -05:00
LetterJay
8dec1d8926 Merge pull request #6363 from Citadel-Station-13/upstream-merge-37110 
[MIRROR] fixes changelings stinging other lings twice
 2018-04-14 07:44:22 -05:00
LetterJay
51c718aa31 Merge pull request #6362 from Citadel-Station-13/upstream-merge-37106 
[MIRROR] Fixes duplicate docking port on aux base template
 2018-04-14 07:44:08 -05:00
LetterJay
2c0884765c Merge pull request #6404 from Citadel-Station-13/upstream-merge-37167 
[MIRROR] Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable)
 2018-04-14 07:43:50 -05:00
LetterJay
698d89c55c Merge pull request #6403 from Citadel-Station-13/upstream-merge-37174 
[MIRROR] Readds dropped #endif
 2018-04-14 07:43:30 -05:00
LetterJay
26636ece0d Merge pull request #6400 from Citadel-Station-13/upstream-merge-37161 
[MIRROR] Makes the PI circuit use the PI define
 2018-04-14 07:43:11 -05:00
LetterJay
5d5dc5483e Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158 
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
 2018-04-14 07:42:57 -05:00
LetterJay
a9f7e829a9 Merge pull request #6398 from Citadel-Station-13/upstream-merge-37178 
[MIRROR] Fixes SCP 194 not using the amount variable.
 2018-04-14 07:42:30 -05:00
LetterJay
f4b54eb9df Merge pull request #6397 from Citadel-Station-13/upstream-merge-37177 
[MIRROR] Reduces aurora caelus weight to that of meteors
 2018-04-14 07:42:16 -05:00
LetterJay
e5e22c2665 Merge pull request #6396 from Citadel-Station-13/upstream-merge-37154 
[MIRROR] Updates baseturf helpers to the new baseturf system
 2018-04-14 07:41:54 -05:00
LetterJay
513db7eb2e Merge pull request #6395 from Citadel-Station-13/upstream-merge-37138 
[MIRROR] Cleans up end of round robo report
 2018-04-14 07:41:32 -05:00
LetterJay
5a9a0c9ed9 Merge pull request #6394 from Citadel-Station-13/upstream-merge-37148 
[MIRROR] Rounded the last digit of pi correctly
 2018-04-14 07:41:12 -05:00
LetterJay
58e70caa69 Merge pull request #6393 from Citadel-Station-13/upstream-merge-37140 
[MIRROR] Fixes bad style for cham projector warning
 2018-04-14 07:40:57 -05:00
LetterJay
8b2ee170bb Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152 
[MIRROR] Fixes conveyor switches.
 2018-04-14 07:39:47 -05:00
LetterJay
47c2bfd13c Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942 
[MIRROR] Fixes tile analyzer
 2018-04-14 07:39:35 -05:00
LetterJay
a01d37560c Merge pull request #6388 from Citadel-Station-13/upstream-merge-37114 
[MIRROR] Adds round id to server ban messages
 2018-04-14 07:39:11 -05:00
CitadelStationBot
d9d93ca9a6 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) 2018-04-14 04:43:25 -05:00