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

5877 Commits

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
vuonojenmustaturska
fbfac8ff36 Merge pull request #37233 from KorPhaeron/gps3 
Fixes BSA targetting offline GPS
 2018-04-15 16:01:10 -05:00
vuonojenmustaturska
472e7f7f61 Allows passive gates to be touched in unpowered areas 2018-04-15 12:41:28 -05:00
vuonojenmustaturska
64def88314 blacklist his grace from being deep-fried 2018-04-15 12:41:19 -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
vuonojenmustaturska
26fb305551 zoinks 2018-04-14 10:57:55 -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
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
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
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
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
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
AnturK
13c40be136 Readds dropped #endif (#37174) 2018-04-13 22:10:47 -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
Dax Dupont
b56b2a94e8 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
Jordan Brown
f52f0f9f33 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00
Emmett Gaines
d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 07:58:37 -05:00
AnturK
4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -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
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
LetterJay
3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858 
[MIRROR] Use a rust DLL for logging
 2018-04-12 07:06:08 -05:00
LetterJay
508e4f4d37 Update tiny_prick.dm 2018-04-12 07:03:26 -05:00
Grandmother of 50
4e74f63147 Changes ore-burning math to avoid decimals (and raise RNG) (#37005) 
* Update ores_coins.dm

* I want that to return watson

* Finally a stats course comes in handy...

* Update ores_coins.dm

* Yay mods :)

* pants on head
 2018-04-12 06:37:33 -05:00
deathride58
51147e928f Merge pull request #6307 from Citadel-Station-13/upstream-merge-36974 
[MIRROR] Minor VR sleeper related changes
 2018-04-11 21:40:00 +00:00
deathride58
512b5e86c9 Merge pull request #6341 from Citadel-Station-13/upstream-merge-36469 
[MIRROR] AI requires silicon exp instead of crew exp for roundstart role
 2018-04-11 21:38:24 +00:00
deathride58
b4ecb3ef27 Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670 
[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful
 2018-04-11 21:37:24 +00:00
deathride58
f89f9c372e Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693 
[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes
 2018-04-11 21:36:35 +00:00
deathride58
538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791 
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
 2018-04-11 21:35:45 +00:00
deathride58
1f9d19a92a Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983 
[MIRROR] Provides more control over uplink surplus chances.
 2018-04-11 21:34:56 +00:00
deathride58
2502bb79bf Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044 
[MIRROR] Fix logic circuits runtime
 2018-04-11 21:32:17 +00:00
deathride58
bca8c97bdf Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082 
[MIRROR] Disables mood traits when mood is disabled
 2018-04-11 21:31:46 +00:00
deathride58
055eacca74 Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073 
[MIRROR] Integrated Circuits Parameter Fixes
 2018-04-11 21:31:17 +00:00
deathride58
dd7cf18694 Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077 
[MIRROR] Fixes warp whistle invis bug
 2018-04-11 21:30:16 +00:00
deathride58
43eee9851c Merge pull request #6360 from Citadel-Station-13/upstream-merge-37094 
[MIRROR] Fixes overlay update for washing bloody hands
 2018-04-11 21:29:52 +00:00
deathride58
72dfdb0a63 Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032 
[MIRROR] Forcing the human liver to actually do its job v2
 2018-04-11 21:28:25 +00:00
deathride58
1bec758c65 Merge pull request #6369 from Citadel-Station-13/upstream-merge-37130 
[MIRROR] Adds tesla coil cargo pack
 2018-04-11 21:27:26 +00:00
deathride58
84a94e1894 Merge pull request #6371 from Citadel-Station-13/upstream-merge-37123 
[MIRROR] Keeps SM shuttle shards from being unwrenched
 2018-04-11 21:27:05 +00:00
deathride58
ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116 
[MIRROR] Fixes order of operations math errors with gas defines.
 2018-04-11 21:26:47 +00:00
The_Dreamweaver
adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00