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

15709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
kevinz000
44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167) 
* Emergency NTNet patch

* ok

* @naksu

* explicit null
 2018-04-14 04:43:25 -05:00
CitadelStationBot
5d05a729d9 Readds dropped #endif 2018-04-13 22:10:47 -05:00
AnturK
13c40be136 Readds dropped #endif (#37174) 2018-04-13 22:10:47 -05:00
CitadelStationBot
a353876bf5 Makes the PI circuit use the PI define 2018-04-13 12:44:13 -05:00
Nich
47c783ec71 Makes the PI circuit use the PI define (#37161) 
* Makes the PI circuit use PI

* I'm a moron :()

* Update arithmetic.dm

* Update arithmetic.dm

* forgot the parentheses

* that's another commit
 2018-04-13 12:44:13 -05:00
CitadelStationBot
c44ba4fdd5 Cleans up CENTCOM morgue/chapel/library doors 2018-04-13 09:04:55 -05:00
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
CitadelStationBot
d1165e1803 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
Dax Dupont
b56b2a94e8 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
CitadelStationBot
29b1160c46 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00
Jordan Brown
f52f0f9f33 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00
CitadelStationBot
98a6e06fc2 Updates baseturf helpers to the new baseturf system 2018-04-13 07:58:37 -05:00
Emmett Gaines
d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 07:58:37 -05:00
CitadelStationBot
023d9b8caf Cleans up end of round robo report 2018-04-13 07:51:16 -05:00
ShizCalev
8f52745322 Cleans up end of round robo report (#37138) 
* Cleans up end of round robo report

* revised comment
 2018-04-13 07:51:16 -05:00
CitadelStationBot
0ad4ac95e6 Rounded the last digit of pi correctly 2018-04-13 07:51:06 -05:00
Putnam3145
5eab3eb454 Rounded the last digit of pi correctly (#37148) 
It's important, fellas. Makes pi 0.000007 wrong instead of 0.00009 wrong.
 2018-04-13 07:51:06 -05:00
CitadelStationBot
56713b0a75 Fixes bad style for cham projector warning 2018-04-13 07:49:54 -05:00
ShizCalev
38b2460760 Fixes bad span class for cham projector warning (#37140) 2018-04-13 07:49:54 -05:00
CitadelStationBot
0bc2c67af9 Fixes conveyor switches. 2018-04-13 04:30:32 -05:00
AnturK
4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -05:00
CitadelStationBot
73c3ac7d81 Fixes tile analyzer 2018-04-12 11:48:28 -05:00
robbym
b7023e1bbb Fixes tile analyzer (#36942) 
* Fixes tile analyzer

* Added requested changes

* Changed turf content filter to /obj

* Added loop to add mobs to scan list
 2018-04-12 11:48:28 -05:00
CitadelStationBot
f2a9fd6c0b Adds round id to server ban messages 2018-04-12 11:47:08 -05:00
Jordie
3a518e0e6d Adds round id to server ban messages (#37114) 
* adds round id to server ban message

* adds round id to ban denied connection message

* adds round id for legacy ban message

* B

* erroneous space
 2018-04-12 11:47:08 -05:00
Chayse Ramsay
58111c6482 Fixing slimepeople (#6386) 2018-04-12 08:39:44 -07:00