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

10022 Commits

Author SHA1 Message Date
iksyp
e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 19:19:51 -05:00
LetterJay
e022564fca Merge pull request #6467 from Citadel-Station-13/upstream-merge-37300 
[MIRROR] fixes skateboards giving infinite metal
 2018-04-22 02:47:07 -05:00
LetterJay
2b70e9a3ae Merge pull request #6466 from Citadel-Station-13/upstream-merge-37312 
[MIRROR] [s] You can no longer buckle anchored mobs to things.
 2018-04-22 02:46:53 -05:00
LetterJay
3966683e17 Merge pull request #6460 from Citadel-Station-13/upstream-merge-37280 
[MIRROR] Removes random spawn
 2018-04-22 02:46:38 -05:00
LetterJay
930c9bf58c Merge pull request #6459 from Citadel-Station-13/upstream-merge-37281 
[MIRROR] Removes old decal system
 2018-04-22 02:46:25 -05:00
LetterJay
52a8708cb7 Merge pull request #6458 from Citadel-Station-13/upstream-merge-37237 
[MIRROR] Fix cycle-linked airlocks on shuttles
 2018-04-22 02:46:01 -05:00
LetterJay
eac582c79a Merge pull request #6457 from Citadel-Station-13/upstream-merge-36701 
[MIRROR] Fixes Kudzu growing in space
 2018-04-22 02:45:47 -05:00
LetterJay
dc9b7d78f6 Merge pull request #6455 from Citadel-Station-13/upstream-merge-37282 
[MIRROR] Fixes capacitor not being consumed when building a gygax
 2018-04-22 02:45:32 -05:00
LetterJay
5688049a7c Merge pull request #6454 from Citadel-Station-13/upstream-merge-37246 
[MIRROR] Removes href log from admin investigate
 2018-04-22 02:45:14 -05:00
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00
LetterJay
68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223 
[MIRROR] Fixes some defines and value
 2018-04-22 02:43:26 -05:00
LetterJay
26cb8d0fe3 Merge pull request #6439 from Citadel-Station-13/upstream-merge-37236 
[MIRROR] .. > ... moodie grammar fix
 2018-04-22 02:43:09 -05:00
LetterJay
76001518d8 Merge pull request #6438 from Citadel-Station-13/upstream-merge-37209 
[MIRROR] Makes admin loaded shuttles work again
 2018-04-22 02:42:28 -05:00
LetterJay
e30d3540b1 Merge pull request #6437 from Citadel-Station-13/upstream-merge-37214 
[MIRROR] Fixes adjusting brain damage.
 2018-04-22 02:42:13 -05:00
LetterJay
d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141 
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
 2018-04-22 02:41:57 -05:00
LetterJay
c6d5050fe7 Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196 
[MIRROR] Gives mining bots back their mesons
 2018-04-22 02:41:25 -05:00
LetterJay
82fd7e8067 Merge pull request #6431 from Citadel-Station-13/upstream-merge-37212 
[MIRROR] Parenthesizes some macros
 2018-04-22 02:39:43 -05:00
LetterJay
ca7bc589d9 Merge pull request #6429 from Citadel-Station-13/upstream-merge-37207 
[MIRROR] Fix grammar in lightbulb shatter message
 2018-04-22 02:39:18 -05:00
LetterJay
7bf009b52c Merge pull request #6427 from Citadel-Station-13/upstream-merge-37201 
[MIRROR] Adds missing arguments to eye insert procs
 2018-04-22 02:38:39 -05:00
LetterJay
bc0afc3c09 Merge pull request #6426 from Citadel-Station-13/upstream-merge-37206 
[MIRROR] Correct some pixel_z issues
 2018-04-22 02:37:42 -05:00
LetterJay
d2ce7da6cb Merge pull request #6453 from Citadel-Station-13/upstream-merge-37251 
[MIRROR] Adds new window spawners
 2018-04-22 02:35:09 -05:00
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218 
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
 2018-04-22 02:34:53 -05:00
LetterJay
80f4522967 Merge pull request #6450 from Citadel-Station-13/upstream-merge-37252 
[MIRROR] Fixes lavaland syndie base rads + SSU compartment issues
 2018-04-22 02:34:03 -05:00
LetterJay
15829a658c Merge pull request #6448 from Citadel-Station-13/upstream-merge-37266 
[MIRROR] Fixes trophies.
 2018-04-22 02:33:40 -05:00
LetterJay
3d4acf38a1 Merge pull request #6446 from Citadel-Station-13/upstream-merge-37216 
[MIRROR] Esword cig lighting messages fix
 2018-04-22 02:32:53 -05:00
LetterJay
3635cd9c71 Merge pull request #6445 from Citadel-Station-13/upstream-merge-37239 
[MIRROR] fixes fuckup in expressconsole preventing packs being ordered when credits are low
 2018-04-22 02:32:38 -05:00
LetterJay
d4538ce920 Merge pull request #6443 from Citadel-Station-13/upstream-merge-37229 
[MIRROR] Add team objective support to the centcom antag datum
 2018-04-22 02:30:55 -05:00
imsxz
2361ba7625 fixes the laws of matter conservation (#37300) 2018-04-20 15:32:32 -05:00
Jordan Brown
0586f69637 Merge pull request #37312 from DaxDupont/tendril 
[s] You can no longer buckle anchored mobs to things.
 2018-04-20 10:47:28 -05:00
AnturK
b0e97784da Removes random spawn (#37280) 2018-04-19 05:46:39 -05:00
Emmett Gaines
a465733b1c Removes old decal system (#37281) 2018-04-19 05:45:25 -05:00
oranges
20823c0c1b Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks 
Fix cycle-linked airlocks on shuttles
 2018-04-19 03:15:01 -05:00
kachnov
03c9996bc4 Fixes Kudzu growing in space (#36701) 
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
 2018-04-19 03:13:47 -05:00
AlexTheSysop42
19f315db9c Fixes capacitor not being consumed when building a gygax (#37282) 
* Comments out code to try to fix a bug

* protip: next time don't commit to master

* Fixes gygax construction not using the capacitor
 2018-04-18 15:46:25 -05:00
Jordie
8ee5092210 removes href log from admin investigate 2018-04-18 15:46:16 -05:00
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218) 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
 2018-04-18 09:33:31 -05:00
81Denton
7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
AnturK
68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
PKPenguin321
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
MrDoomBringer
846aa734e8 fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
 2018-04-16 19:14:08 -05:00
kevinz000
6cd18fd5c5 My adventures in getFlatIcon performance (#36890) 2018-04-16 17:59:41 -05:00
Jordan Brown
889f8ddb06 Merge pull request #37229 from vuonojenmustaturska/centcommission 
Add team objective support to the centcom antag datum
 2018-04-16 16:17:42 -05:00
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
Armhulen
5cbff26d24 Grammar (#37236) 2018-04-16 07:45:28 -05:00
vuonojenmustaturska
65c8fea74e Merge pull request #37209 from ninjanomnom/admin-shuttles 
Makes admin loaded shuttles work again
 2018-04-16 07:40:09 -05:00
vuonojenmustaturska
d2b4b6d2f0 Merge pull request #37214 from AnturK/imighthavebraindamage 
Fixes adjusting brain damage.
 2018-04-16 07:39:54 -05:00
Grandmother of 50
0fca7cf7f0 Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141) 
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
 2018-04-16 04:39:57 -05:00
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196) 
* Gives mining bots back their mesons

* qdel
 2018-04-16 04:36:40 -05:00