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

15889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
LetterJay 86e3cac966 Merge pull request #6480 from Citadel-Station-13/upstream-merge-37324 
[MIRROR] Makes engine goggle numbers more visible
 2018-04-22 22:22:38 -05:00
LetterJay d690ffab66 Merge pull request #6479 from Citadel-Station-13/upstream-merge-37325 
[MIRROR] Delta ORM position
 2018-04-22 22:22:25 -05:00
LetterJay fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315 
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
 2018-04-22 22:22:03 -05:00
LetterJay de2ab536d1 Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320 
[MIRROR] Fixes pAI's breaking drone static.
 2018-04-22 22:21:45 -05:00
LetterJay f3fb253713 Merge pull request #6476 from Citadel-Station-13/upstream-merge-37321 
[MIRROR] Fixes CTF cheating
 2018-04-22 22:21:21 -05:00
LetterJay 8170e2b6c1 Merge pull request #6475 from Citadel-Station-13/upstream-merge-37314 
[MIRROR] Mapping component helper
 2018-04-22 22:20:58 -05:00
LetterJay 4226fa8b27 Merge pull request #6474 from Citadel-Station-13/upstream-merge-37305 
[MIRROR] Adds a note if the loaded away mission is custom in the logs.
 2018-04-22 22:20:39 -05:00
LetterJay 7bf8b9654e Merge pull request #6473 from Citadel-Station-13/upstream-merge-37306 
[MIRROR] Fixes falsewall letting through air.
 2018-04-22 22:20:22 -05:00
LetterJay 174a1d01ab Merge pull request #6472 from Citadel-Station-13/upstream-merge-37310 
[MIRROR] Fixes and optimises apc_control.dm a tad.
 2018-04-22 22:20:01 -05:00
LetterJay 7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270 
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
 2018-04-22 22:19:28 -05:00
LetterJay 73e798b281 Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304 
[MIRROR] Fixes buildmode trying to build in nullspace.
 2018-04-22 22:19:06 -05:00
LetterJay 7cc2aeea8f Merge pull request #6469 from Citadel-Station-13/upstream-merge-37301 
[MIRROR] Flatten the map transition edges
 2018-04-22 22:18:47 -05:00
CitadelStationBot 17e0981183 Fixes a lack of feedback when entering too many points for the gulag. 2018-04-22 19:42:47 -05:00
Dax Dupont af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00
CitadelStationBot 5d688bb0de Makes engine goggle numbers more visible 2018-04-22 19:21:13 -05:00
KorPhaeron b36d88900f Makes engine goggle numbers more visible (#37324) 2018-04-22 19:21:13 -05:00
CitadelStationBot 9da1461eeb Delta ORM position 2018-04-22 19:21:05 -05:00
81Denton 3bcfd0dfb6 Delta ORM position (#37325) 
* makes delta ORM accessible

* turf decal
 2018-04-22 19:21:04 -05:00
CitadelStationBot 282857aa04 Gives beer and soda dispensers their own circuitboards and Design ID's 2018-04-22 19:19:51 -05:00
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
CitadelStationBot fdf05c5aca Fixes pAI's breaking drone static. 2018-04-22 19:19:43 -05:00
AnturK e36c44be5c Fixes pAI's breaking drone static. (#37320) 2018-04-22 19:19:43 -05:00
CitadelStationBot 05f7e3dd9b Fixes CTF cheating 2018-04-22 19:19:32 -05:00
KorPhaeron 0c6aea73d3 Can't push CTF flag carriers (#37321) 2018-04-22 19:19:32 -05:00
CitadelStationBot 1d32b0e520 Mapping component helper 2018-04-22 19:18:17 -05:00
AnturK 8a3caaae6b Mapping component helper (#37314) 
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
 2018-04-22 19:18:17 -05:00
CitadelStationBot 51019d673d Adds a note if the loaded away mission is custom in the logs. 2018-04-22 19:17:05 -05:00
AnturK 54ef24b75a Adds a note if the loaded away is custom or not in the logs. (#37305) 2018-04-22 19:17:05 -05:00
CitadelStationBot 74e7e1978a Fixes falsewall letting through air. 2018-04-22 19:15:51 -05:00
AnturK 1c390cbbc5 Fixes falsewall letting through air. (#37306) 
* Fixes falsewall letting through air.

* define
 2018-04-22 19:15:51 -05:00
CitadelStationBot 24d1182b18 Fixes and optimises apc_control.dm a tad. 2018-04-22 09:31:11 -05:00
Jordan Brown 70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes 
Fixes and optimises apc_control.dm a tad.
 2018-04-22 09:31:10 -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 675243f95e Merge pull request #6449 from Citadel-Station-13/thefuckarethesenumbers 
Rebalances pump-action energy shotguns
 2018-04-22 02:44:40 -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 11b90af942 Merge pull request #6434 from Citadel-Station-13/upstream-merge-37193 
[MIRROR] Fixes runtime condenser
 2018-04-22 02:40:02 -05:00